summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Hunkeler <jhunk@stsci.edu>2016-04-20 00:05:56 -0400
committerJoseph Hunkeler <jhunk@stsci.edu>2016-04-20 00:05:56 -0400
commit767da1fa23b846f87a72bdbd3e496fb97a274ed9 (patch)
treee47a3e5b6340d670313eaa30eb75d76ca5766cdb
parent1036d8a1201d335288dd6c426c3e146dfd2750b0 (diff)
downloadastroconda-dev-767da1fa23b846f87a72bdbd3e496fb97a274ed9.tar.gz
General dependency fixes
-rw-r--r--acstools/meta.yaml1
-rw-r--r--costools/meta.yaml1
-rw-r--r--decorators/meta.yaml4
-rw-r--r--hstcal/meta.yaml4
-rw-r--r--pyneb/meta.yaml9
-rw-r--r--stwcs/build.sh5
6 files changed, 12 insertions, 12 deletions
diff --git a/acstools/meta.yaml b/acstools/meta.yaml
index 086fd1a..6dc34d5 100644
--- a/acstools/meta.yaml
+++ b/acstools/meta.yaml
@@ -27,6 +27,7 @@ requirements:
- numpy x.x
- python x.x
run:
+ - d2to1
- astropy >=1.1
- scipy
- scikit-image
diff --git a/costools/meta.yaml b/costools/meta.yaml
index f13855c..6681cf9 100644
--- a/costools/meta.yaml
+++ b/costools/meta.yaml
@@ -24,6 +24,7 @@ requirements:
- numpy x.x
- python x.x
run:
+ - d2to1
- astropy >=1.1
- calcos
- stsci.tools
diff --git a/decorators/meta.yaml b/decorators/meta.yaml
index a9439dd..863309b 100644
--- a/decorators/meta.yaml
+++ b/decorators/meta.yaml
@@ -1,5 +1,5 @@
{% set name = 'decorators' %}
-{% set version = '4.0.9' %}
+{% set version = '0.1' %}
{% set number = '0' %}
about:
@@ -19,6 +19,6 @@ requirements:
- python x.x
source:
fn: {{ name }}-{{ version }}.tar.gz
- md5: f12c5651ccd707e12a0abaa4f76cd69a
+ md5: 755857960408500848d1adc9d6495e98
url:
- https://pypi.python.org/packages/source/d/decorators/{{ name }}-{{ version }}.tar.gz
diff --git a/hstcal/meta.yaml b/hstcal/meta.yaml
index 8d67085..e697657 100644
--- a/hstcal/meta.yaml
+++ b/hstcal/meta.yaml
@@ -15,8 +15,8 @@ package:
version: {{ version }}
requirements:
build:
- - gcc >=4.6 [osx]
+ - gcc >=4.7 [osx]
run:
- - libgcc >=4.6 [osx]
+ - libgcc >=4.7 [osx]
source:
git_url: https://github.com/spacetelescope/hstcal
diff --git a/pyneb/meta.yaml b/pyneb/meta.yaml
index 86a4ff6..212e0bb 100644
--- a/pyneb/meta.yaml
+++ b/pyneb/meta.yaml
@@ -1,3 +1,4 @@
+{% set badname = 'PyNeb' %}
{% set name = 'pyneb' %}
{% set version = '1.0.14' %}
{% set number = '0' %}
@@ -15,20 +16,20 @@ requirements:
build:
- astropy
- matplotlib
- - numpy >=1.5.1
+ - numpy x.x
- scipy
- setuptools
- python x.x
run:
- astropy
- matplotlib
- - numpy >=1.5.1
+ - numpy x.x
- scipy
- python x.x
source:
- fn: {{ name }}-{{ version }}.tar.gz
+ fn: {{ badname }}-{{ version }}.tar.gz
url:
- - https://pypi.python.org/packages/source/P/pyneb
+ - https://pypi.python.org/packages/source/P/{{ badname }}/{{ badname }}-{{ version }}.tar.gz
test:
imports:
- pyneb
diff --git a/stwcs/build.sh b/stwcs/build.sh
index 7ee7c62..c4021f1 100644
--- a/stwcs/build.sh
+++ b/stwcs/build.sh
@@ -22,7 +22,4 @@ set_py3k
sed -i -e "s|use_2to3=True|use_2to3=False|" setup.py
-if [ $PY3K -ne 0 ] ; then
-fi
-
-python setup.py install || exit 1 \ No newline at end of file
+python setup.py install || exit 1