Merge pull request #57 from jakirkham/fixes_ruamel_yaml

Fixes for ruamel_yaml
ContinuumIO · Nov 18, 2016 · 3db74d6 · 3db74d6
2 parents 0d75c96 + b643e0a
commit 3db74d6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git 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__ ="[email protected]"

diff --git a/ruamel_yaml/meta.yaml b/ruamel_yaml/meta.yaml
@@ -2,17 +2,19 @@ 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
+    - setuptools
     - cython
     - yaml
   run:
@@ -30,4 +32,4 @@ about:
   home: https://bitbucket.org/ruamel/yaml
   license: MIT
   license_file: LICENSE
-  summary: patched copy of ruamel.yaml (a yaml parser)
+  summary: A patched copy of ruamel.yaml (a yaml parser).
diff --git 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