summaryrefslogtreecommitdiff
path: root/pyds9
diff options
context:
space:
mode:
Diffstat (limited to 'pyds9')
-rw-r--r--pyds9/bld.bat2
-rw-r--r--pyds9/build.sh2
-rw-r--r--pyds9/meta.yaml15
3 files changed, 10 insertions, 9 deletions
diff --git a/pyds9/bld.bat b/pyds9/bld.bat
index dd8cae5..b572366 100644
--- a/pyds9/bld.bat
+++ b/pyds9/bld.bat
@@ -1,3 +1,3 @@
echo "Not yet"
-exit 1 \ No newline at end of file
+exit 1
diff --git a/pyds9/build.sh b/pyds9/build.sh
index 4b71885..6bd6081 100644
--- a/pyds9/build.sh
+++ b/pyds9/build.sh
@@ -1,2 +1,2 @@
-python setup.py install || exit 1 \ No newline at end of file
+$PYTHON setup.py install
diff --git a/pyds9/meta.yaml b/pyds9/meta.yaml
index 1ad3fd5..8544681 100644
--- a/pyds9/meta.yaml
+++ b/pyds9/meta.yaml
@@ -1,8 +1,9 @@
{% set name = 'pyds9' %}
-{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0")
- +".dev"
- +environ.get("GIT_DESCRIBE_NUMBER", "0") %}
-{% set number = '1' %}
+{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %}
+{% if version[0] == 'v' %}
+{% set version = version[1:] %}
+{% endif %}
+{% set number = '2' %}
about:
home: https://github.com/ericmandel/{{ name }}
@@ -23,8 +24,8 @@ requirements:
- ds9
- six
- setuptools
- - numpy
- - python x.x
+ - numpy {{ numpy }}
+ - python {{ python }}
run:
- astropy
@@ -32,7 +33,7 @@ requirements:
- ds9
- six
- numpy
- - python x.x
+ - python
source:
git_url: https://github.com/ericmandel/{{ name }}.git