From d0568e5b1b0d5b4b6ff3d3304ff62b7d197d3896 Mon Sep 17 00:00:00 2001 From: John Kirkham Date: Mon, 7 Nov 2016 00:33:03 -0500 Subject: [PATCH 1/6] ruamel_yaml: Fix version patching. --- ruamel_yaml/meta.yaml | 1 + ruamel_yaml/prepare.bash | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ruamel_yaml/meta.yaml b/ruamel_yaml/meta.yaml index febe388..d2896ed 100644 --- a/ruamel_yaml/meta.yaml +++ b/ruamel_yaml/meta.yaml @@ -13,6 +13,7 @@ source: requirements: build: - python + - setuptools - cython - yaml run: diff --git a/ruamel_yaml/prepare.bash b/ruamel_yaml/prepare.bash index c83f0b0..a276d2c 100644 --- a/ruamel_yaml/prepare.bash +++ b/ruamel_yaml/prepare.bash @@ -25,4 +25,4 @@ touch $SRC_DIR/ruamel_yaml/ext/__init__.py cp $RECIPE_DIR/setup.py $SRC_DIR/ cp $RECIPE_DIR/__init__.py $SRC_DIR/ruamel_yaml/ -sed -i -e 's/__version__.*/__version__ = "$VERSION"/' $SRC_DIR/ruamel_yaml/__init__.py +sed -i -e "s/__version__.*/__version__ = "'"'"${VERSION}"'"'"/" $SRC_DIR/ruamel_yaml/__init__.py From 536f180f73e5cf906ebf24339ef924320dd63291 Mon Sep 17 00:00:00 2001 From: John Kirkham Date: Mon, 7 Nov 2016 00:33:55 -0500 Subject: [PATCH 2/6] ruamel_yaml: Drop explicit version references. --- ruamel_yaml/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruamel_yaml/__init__.py b/ruamel_yaml/__init__.py index 7081856..3a3b91e 100644 --- a/ruamel_yaml/__init__.py +++ b/ruamel_yaml/__init__.py @@ -1,7 +1,7 @@ # coding: utf-8 from __future__ import print_function, absolute_import -__version__ = "0.11.7" +__version__ = "$VERSION" __name__ = "ruamel_yaml" __author__ = "Anthon van der Neut" __author_email__ ="a.van.der.neut@ruamel.eu" From f43c62d96119b58221e674763215efbd4f47b62a Mon Sep 17 00:00:00 2001 From: John Kirkham Date: Mon, 7 Nov 2016 00:38:55 -0500 Subject: [PATCH 3/6] ruamel_yaml: Use a tarball for the source. Add a checksum. --- ruamel_yaml/meta.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ruamel_yaml/meta.yaml b/ruamel_yaml/meta.yaml index d2896ed..fc76a89 100644 --- a/ruamel_yaml/meta.yaml +++ b/ruamel_yaml/meta.yaml @@ -2,14 +2,15 @@ package: name: ruamel_yaml version: 0.11.14 +source: + fn: ruamel_yaml-0.11.14.tar.gz + url: https://bitbucket.org/ruamel/yaml/get/0.11.14.tar.gz + sha256: b78d394e192b6d0911bd59f794ceea88143fac4e373b76ed7e48143a2a29b33c + build: number: 0 no_link: .*\.(pyd|dll) [win] -source: - hg_url: https://bitbucket.org/ruamel/yaml - hg_tag: 0.11.14 - requirements: build: - python From 8ab0ab2d77a8077e82a9419d4cc46d2342d9c0e5 Mon Sep 17 00:00:00 2001 From: John Kirkham Date: Mon, 7 Nov 2016 00:39:38 -0500 Subject: [PATCH 4/6] ruamel_yaml: Add the `license_family`. --- ruamel_yaml/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/ruamel_yaml/meta.yaml b/ruamel_yaml/meta.yaml index fc76a89..b812502 100644 --- a/ruamel_yaml/meta.yaml +++ b/ruamel_yaml/meta.yaml @@ -31,4 +31,5 @@ test: about: home: https://bitbucket.org/ruamel/yaml license: MIT + license_family: MIT license_file: LICENSE From cd6e0a257655b112f51518756d359461cb7a5da5 Mon Sep 17 00:00:00 2001 From: John Kirkham Date: Mon, 7 Nov 2016 00:40:02 -0500 Subject: [PATCH 5/6] ruamel_yaml: Add a summary. --- ruamel_yaml/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/ruamel_yaml/meta.yaml b/ruamel_yaml/meta.yaml index b812502..4f166cd 100644 --- a/ruamel_yaml/meta.yaml +++ b/ruamel_yaml/meta.yaml @@ -33,3 +33,4 @@ about: license: MIT license_family: MIT license_file: LICENSE + summary: A patched copy of ruamel.yaml. From b643e0ab47e3b62db8511617748bcde3fa7a62fc Mon Sep 17 00:00:00 2001 From: John Kirkham Date: Fri, 18 Nov 2016 01:25:14 -0500 Subject: [PATCH 6/6] ruamel_yaml: Drop `license_family` as it is redundant in this case. --- ruamel_yaml/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/ruamel_yaml/meta.yaml b/ruamel_yaml/meta.yaml index 93c7386..5b413c2 100644 --- a/ruamel_yaml/meta.yaml +++ b/ruamel_yaml/meta.yaml @@ -31,6 +31,5 @@ test: about: home: https://bitbucket.org/ruamel/yaml license: MIT - license_family: MIT license_file: LICENSE summary: A patched copy of ruamel.yaml (a yaml parser).