summaryrefslogtreecommitdiff
path: root/stwcs
diff options
context:
space:
mode:
authorMatt Rendina <rendinam@users.noreply.github.com>2018-02-22 08:53:06 -0500
committerGitHub <noreply@github.com>2018-02-22 08:53:06 -0500
commitd4ccb57a335dfda4b3583107767a081691352b2f (patch)
tree43dd1892560bcc467c5eaf1373390cefe4707acd /stwcs
parentebe4788bd2ee01f8b991f02d1665db3d87cc383d (diff)
parente027b0e371ddedc4377b43b425d2f67282ff45b7 (diff)
downloadastroconda-contrib-d4ccb57a335dfda4b3583107767a081691352b2f.tar.gz
Merge branch 'master' into patch-3
Diffstat (limited to 'stwcs')
-rw-r--r--stwcs/bld.bat3
-rw-r--r--stwcs/meta.yaml6
2 files changed, 6 insertions, 3 deletions
diff --git a/stwcs/bld.bat b/stwcs/bld.bat
index 2d6c912..39b5e1f 100644
--- a/stwcs/bld.bat
+++ b/stwcs/bld.bat
@@ -1,2 +1 @@
-python setup.py install
-if errorlevel 1 exit 1
+%PYTHON% setup.py install
diff --git a/stwcs/meta.yaml b/stwcs/meta.yaml
index 4b7ee2c..23e4d26 100644
--- a/stwcs/meta.yaml
+++ b/stwcs/meta.yaml
@@ -1,6 +1,9 @@
{% set name = 'stwcs' %}
{% set version = '1.4.0' %}
-{% set number = '0' %}
+{% if version[0] == 'v' %}
+{% set version = version[1:] %}
+{% endif %}
+{% set number = '1' %}
about:
home: https://github.com/spacetelescope/{{ name }}
@@ -10,6 +13,7 @@ about:
build:
number: {{ number }}
+ skip: True [py27]
package:
name: {{ name }}