summaryrefslogtreecommitdiff
path: root/pandokia
diff options
context:
space:
mode:
Diffstat (limited to 'pandokia')
-rw-r--r--pandokia/bld.bat3
-rw-r--r--pandokia/build.sh2
-rw-r--r--pandokia/meta.yaml13
3 files changed, 9 insertions, 9 deletions
diff --git a/pandokia/bld.bat b/pandokia/bld.bat
index b290566..760380e 100644
--- a/pandokia/bld.bat
+++ b/pandokia/bld.bat
@@ -1,3 +1,2 @@
-python setup.py install
-if errorlevel 1 exit 1 \ No newline at end of file
+%PYTHON% setup.py install
diff --git a/pandokia/build.sh b/pandokia/build.sh
index 4b71885..6bd6081 100644
--- a/pandokia/build.sh
+++ b/pandokia/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/pandokia/meta.yaml b/pandokia/meta.yaml
index 54ad4f3..5084e95 100644
--- a/pandokia/meta.yaml
+++ b/pandokia/meta.yaml
@@ -1,8 +1,9 @@
{% set name = 'pandokia' %}
-{% set version = environ.get("GIT_DESCRIBE_TAG", "0.0.0")
- +".dev"
- +environ.get("GIT_DESCRIBE_NUMBER", "0") %}
-{% set number = '0' %}
+{% set version = GIT_DESCRIBE_TAG ~ ".dev" ~ GIT_DESCRIBE_NUMBER ~ "+" ~ GIT_DESCRIBE_HASH %}
+{% if version[0] == 'v' %}
+{% set version = version[1:] %}
+{% endif %}
+{% set number = '1' %}
about:
home: http://ssb.stsci.edu/testing/{{ name }}
@@ -24,13 +25,13 @@ requirements:
- pytest
- shunit2
- setuptools
- - python x.x
+ - python {{ python }}
run:
- nose
- shunit2
- pytest
- - python x.x
+ - python
source:
git_url: https://github.com/spacetelescope/{{ name }}.git