summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--webbpsf-data/meta.yaml6
-rw-r--r--webbpsf/bld.bat1
-rw-r--r--webbpsf/build.sh4
-rw-r--r--webbpsf/meta.yaml8
4 files changed, 7 insertions, 12 deletions
diff --git a/webbpsf-data/meta.yaml b/webbpsf-data/meta.yaml
index 016e0d6..243a3f3 100644
--- a/webbpsf-data/meta.yaml
+++ b/webbpsf-data/meta.yaml
@@ -1,6 +1,6 @@
{% set name = 'webbpsf-data' %}
-{% set version = '0.5.0' %}
-{% set number = '1' %}
+{% set version = '0.7.0' %}
+{% set number = '0' %}
about:
home: http://www.stsci.edu/~mperrin/software/webbpsf
@@ -17,4 +17,4 @@ package:
source:
fn: {{ name }}-{{ version }}.tar.gz
url: http://www.stsci.edu/~mperrin/software/webbpsf/{{ name }}-{{ version }}.tar.gz
- md5: c1cd63fcb68f97382e5ca5a64f720e46
+ md5: f1ebd2bfe981aebc299dae93b079e59c
diff --git a/webbpsf/bld.bat b/webbpsf/bld.bat
index 760380e..39b5e1f 100644
--- a/webbpsf/bld.bat
+++ b/webbpsf/bld.bat
@@ -1,2 +1 @@
-
%PYTHON% setup.py install
diff --git a/webbpsf/build.sh b/webbpsf/build.sh
index 49370ee..5a5aeeb 100644
--- a/webbpsf/build.sh
+++ b/webbpsf/build.sh
@@ -1,5 +1 @@
-# Remove astropy version pinning (i.e, handled by recipe)
-sed -e "s/'astropy[\!=<>].*,$/'astropy',/" setup.py > setup.py.new
-mv setup.py.new setup.py
-
$PYTHON setup.py install
diff --git a/webbpsf/meta.yaml b/webbpsf/meta.yaml
index 682dd8e..0baa650 100644
--- a/webbpsf/meta.yaml
+++ b/webbpsf/meta.yaml
@@ -3,7 +3,7 @@
{% if version[0] == 'v' %}
{% set version = version[1:] %}
{% endif %}
-{% set number = '2' %}
+{% set number = '3' %}
# Keep in mind:
# webbpsf-data is version-locked to prevent older builds from picking
@@ -34,7 +34,7 @@ requirements:
- pysiaf
- jwxml
- six [py27]
- - webbpsf-data >=0.4.1
+ - webbpsf-data >=0.7.0
- setuptools
- python {{ python }}
@@ -48,12 +48,12 @@ requirements:
- poppy
- pysiaf
- six [py27]
- - webbpsf-data >=0.4.1
+ - webbpsf-data >=0.7.0
- setuptools
- python
source:
- git_url: https://github.com/mperrin/{{ name }}.git
+ git_url: https://github.com/spacetelescope/{{ name }}.git
test:
commands: