summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Hunkeler <jhunkeler@users.noreply.github.com>2016-06-29 17:03:41 -0400
committerGitHub <noreply@github.com>2016-06-29 17:03:41 -0400
commit90eb671b2054b89a69525edc80add7dd3378f890 (patch)
tree2861a6e7279a90c881ccddc6f6e41d127ad5b730
parenta9302aab5aa412ca9542cdcb59dfd8684f44bca4 (diff)
downloadastroconda-contrib-90eb671b2054b89a69525edc80add7dd3378f890.tar.gz
Free range packages (#20)
* Allow packages updates without metapackages conflicting * Fix numpy locking * Update purge_path requirement * git https not ssh * Redo changes prior to rebase
-rw-r--r--pyfftw/meta.yaml4
-rw-r--r--pyneb/meta.yaml6
-rw-r--r--pyraf/meta.yaml20
-rw-r--r--pytools/meta.yaml6
-rw-r--r--stsci-data-analysis/meta.yaml24
-rw-r--r--stsci-hst/meta.yaml122
-rw-r--r--stsci.sphere/meta.yaml4
-rw-r--r--stsci/meta.yaml50
8 files changed, 114 insertions, 122 deletions
diff --git a/pyfftw/meta.yaml b/pyfftw/meta.yaml
index 31b5686..2542067 100644
--- a/pyfftw/meta.yaml
+++ b/pyfftw/meta.yaml
@@ -3,13 +3,12 @@ about:
license: GPL
summary: pyfftw
build:
- number: '0'
+ number: '1'
package:
name: pyfftw
version: 0.9.2
requirements:
build:
- - numpy >=1.9
- fftw
- cython
- pkg-config [osx]
@@ -17,7 +16,6 @@ requirements:
- numpy x.x
- python x.x
run:
- - numpy >=1.9
- cython
- fftw
- numpy x.x
diff --git a/pyneb/meta.yaml b/pyneb/meta.yaml
index cb7f823..a979994 100644
--- a/pyneb/meta.yaml
+++ b/pyneb/meta.yaml
@@ -3,7 +3,7 @@ about:
license: Unknown
summary: A modern python tool to compute emission line emissivities
build:
- number: '0'
+ number: '1'
package:
name: pyneb
version: 1.0.14
@@ -11,15 +11,15 @@ requirements:
build:
- astropy
- matplotlib
- - numpy >=1.5.1
- scipy
- setuptools
+ - numpy x.x
- python x.x
run:
- astropy
- matplotlib
- - numpy >=1.5.1
- scipy
+ - numpy x.x
- python x.x
source:
fn: pyneb-1.0.14.tar.gz
diff --git a/pyraf/meta.yaml b/pyraf/meta.yaml
index 92456dc..9e9be3e 100644
--- a/pyraf/meta.yaml
+++ b/pyraf/meta.yaml
@@ -1,6 +1,6 @@
{% set name = 'pyraf' %}
{% set version = '2.1.10' %}
-{% set number = '1' %}
+{% set number = '2' %}
about:
home: https://github.com/spacetelescope/pyraf
@@ -17,12 +17,9 @@ requirements:
- astropy >=1.1
- ipython
- matplotlib
- - pyobjc-core ==3.0.4 [osx and py27]
- - pyobjc-framework-cocoa ==3.0.4 [osx and py27]
- - pyobjc-framework-quartz ==3.0.4 [osx and py27]
- - pyobjc-core ==3.1.1 [osx and py3k]
- - pyobjc-framework-cocoa ==3.1.1 [osx and py3k]
- - pyobjc-framework-quartz ==3.1.1 [osx and py3k]
+ - pyobjc-core >=3.0.4 [osx]
+ - pyobjc-framework-cocoa >=3.0.4 [osx]
+ - pyobjc-framework-quartz >=3.0.4 [osx]
- stsci.tools
- setuptools
- numpy x.x
@@ -31,12 +28,9 @@ requirements:
- astropy >=1.1
- ipython
- matplotlib
- - pyobjc-core ==3.0.4 [osx and py27]
- - pyobjc-framework-cocoa ==3.0.4 [osx and py27]
- - pyobjc-framework-quartz ==3.0.4 [osx and py27]
- - pyobjc-core ==3.1.1 [osx and py3k]
- - pyobjc-framework-cocoa ==3.1.1 [osx and py3k]
- - pyobjc-framework-quartz ==3.1.1 [osx and py3k]
+ - pyobjc-core >=3.0.4 [osx]
+ - pyobjc-framework-cocoa >=3.0.4 [osx]
+ - pyobjc-framework-quartz >=3.0.4 [osx]
- stsci.tools
- numpy x.x
- python x.x
diff --git a/pytools/meta.yaml b/pytools/meta.yaml
index 4245dc7..1f4f8f0 100644
--- a/pytools/meta.yaml
+++ b/pytools/meta.yaml
@@ -3,7 +3,7 @@ about:
license: MIT
summary: A collection of tools for Python
build:
- number: '0'
+ number: '1'
package:
name: pytools
version: '2016.1'
@@ -12,14 +12,14 @@ requirements:
- decorator >=3.2.0
- appdirs >=1.4.0
- six >=1.8.0
- - numpy >=1.6.0
- setuptools
+ - numpy x.x
- python x.x
run:
- decorator >=3.2.0
- appdirs >=1.4.0
- six >=1.8.0
- - numpy >=1.6.0
+ - numpy x.x
- python x.x
source:
fn: pytools-2016.1.tar.gz
diff --git a/stsci-data-analysis/meta.yaml b/stsci-data-analysis/meta.yaml
index 88a49ea..bc20871 100644
--- a/stsci-data-analysis/meta.yaml
+++ b/stsci-data-analysis/meta.yaml
@@ -10,21 +10,21 @@ package:
requirements:
build:
- astropy >=1.1
- - specview ==0.1
- - astroimtools ==0.1
- - cube-tools ==0.0.0
- - stginga ==0.1
- - asv ==0.1.1
- - asdf ==1.0.2
+ - specview >=0.1
+ - astroimtools >=0.1
+ - cube-tools >=0.0.0
+ - stginga >=0.1
+ - asv >=0.1.1
+ - asdf >=1.0.2
- numpy x.x
- python x.x
run:
- astropy >=1.1
- - specview ==0.1
- - astroimtools ==0.1
- - cube-tools ==0.0.0
- - stginga ==0.1
- - asv ==0.1.1
- - asdf ==1.0.2
+ - specview >=0.1
+ - astroimtools >=0.1
+ - cube-tools >=0.0.0
+ - stginga >=0.1
+ - asv >=0.1.1
+ - asdf >=1.0.2
- numpy x.x
- python x.x
diff --git a/stsci-hst/meta.yaml b/stsci-hst/meta.yaml
index ace5cb7..186bc79 100644
--- a/stsci-hst/meta.yaml
+++ b/stsci-hst/meta.yaml
@@ -3,76 +3,76 @@ about:
license: BSD
summary: stsci-hst meta-package
build:
- number: '0'
+ number: '1'
package:
name: stsci-hst
version: 1.0.2
requirements:
build:
- - purge_path >=0.0.1
- - acstools ==2.0.0
- - astrolib.coords ==0.39.6
+ - purge_path >=1.0.0
+ - acstools >=2.0.0
+ - astrolib.coords >=0.39.6
- astropy >=1.1
- - calcos ==3.1.7
- - costools ==1.2.1
- - crds ==6.0.0
- - d2to1 ==0.2.12
- - drizzlepac ==2.1.3
- - fitsblender ==0.2.6
- - hstcal ==1.0.0
- - nictools ==1.1.3
- - pyregion ==1.1.2
- - pysynphot ==0.9.8.2
- - reftools ==1.7.1
- - stistools ==1.1
- - stsci.convolve ==2.1.3
- - stsci.distutils ==0.3.8
- - stsci.image ==2.2.0
- - stsci.imagemanip ==1.1.2
- - stsci.imagestats ==1.4.1
- - stsci.ndimage ==0.10.1
- - stsci.numdisplay ==1.6.1
- - stsci.sphinxext ==1.2.2
- - stsci.stimage ==0.2.1
- - stsci.skypac ==0.9
- - stsci.sphere ==0.2
- - stsci.tools ==3.4.1
- - stwcs ==1.2.3
- - wfpc2tools ==1.0.3
- - wfc3tools ==1.3.1
+ - calcos >=3.1.7
+ - costools >=1.2.1
+ - crds >=6.0.0
+ - d2to1 >=0.2.12
+ - drizzlepac >=2.1.3
+ - fitsblender >=0.2.6
+ - hstcal >=1.0.0
+ - nictools >=1.1.3
+ - pyregion >=1.1.2
+ - pysynphot >=0.9.8.2
+ - reftools >=1.7.1
+ - stistools >=1.1
+ - stsci.convolve >=2.1.3
+ - stsci.distutils >=0.3.8
+ - stsci.image >=2.2.0
+ - stsci.imagemanip >=1.1.2
+ - stsci.imagestats >=1.4.1
+ - stsci.ndimage >=0.10.1
+ - stsci.numdisplay >=1.6.1
+ - stsci.sphinxext >=1.2.2
+ - stsci.stimage >=0.2.1
+ - stsci.skypac >=0.9
+ - stsci.sphere >=0.2
+ - stsci.tools >=3.4.1
+ - stwcs >=1.2.3
+ - wfpc2tools >=1.0.3
+ - wfc3tools >=1.3.1
- numpy x.x
- python x.x
run:
- - purge_path >=0.0.1
- - acstools ==2.0.0
- - astrolib.coords ==0.39.6
+ - purge_path >=1.0.0
+ - acstools >=2.0.0
+ - astrolib.coords >=0.39.6
- astropy >=1.1
- - calcos ==3.1.7
- - costools ==1.2.1
- - crds ==6.0.0
- - d2to1 ==0.2.12
- - drizzlepac ==2.1.3
- - fitsblender ==0.2.6
- - hstcal ==1.0.0
- - nictools ==1.1.3
- - pyregion ==1.1.2
- - pysynphot ==0.9.8.2
- - reftools ==1.7.1
- - stistools ==1.1
- - stsci.convolve ==2.1.3
- - stsci.distutils ==0.3.8
- - stsci.image ==2.2.0
- - stsci.imagemanip ==1.1.2
- - stsci.imagestats ==1.4.1
- - stsci.ndimage ==0.10.1
- - stsci.numdisplay ==1.6.1
- - stsci.sphinxext ==1.2.2
- - stsci.stimage ==0.2.1
- - stsci.skypac ==0.9
- - stsci.sphere ==0.2
- - stsci.tools ==3.4.1
- - stwcs ==1.2.3
- - wfpc2tools ==1.0.3
- - wfc3tools ==1.3.1
+ - calcos >=3.1.7
+ - costools >=1.2.1
+ - crds >=6.0.0
+ - d2to1 >=0.2.12
+ - drizzlepac >=2.1.3
+ - fitsblender >=0.2.6
+ - hstcal >=1.0.0
+ - nictools >=1.1.3
+ - pyregion >=1.1.2
+ - pysynphot >=0.9.8.2
+ - reftools >=1.7.1
+ - stistools >=1.1
+ - stsci.convolve >=2.1.3
+ - stsci.distutils >=0.3.8
+ - stsci.image >=2.2.0
+ - stsci.imagemanip >=1.1.2
+ - stsci.imagestats >=1.4.1
+ - stsci.ndimage >=0.10.1
+ - stsci.numdisplay >=1.6.1
+ - stsci.sphinxext >=1.2.2
+ - stsci.stimage >=0.2.1
+ - stsci.skypac >=0.9
+ - stsci.sphere >=0.2
+ - stsci.tools >=3.4.1
+ - stwcs >=1.2.3
+ - wfpc2tools >=1.0.3
+ - wfc3tools >=1.3.1
- numpy x.x
- python x.x
diff --git a/stsci.sphere/meta.yaml b/stsci.sphere/meta.yaml
index 33ba98a..ad48145 100644
--- a/stsci.sphere/meta.yaml
+++ b/stsci.sphere/meta.yaml
@@ -3,7 +3,7 @@ about:
license: GPL
summary: stsci.sphere
build:
- number: '0'
+ number: '1'
preserve_egg_dir: 'yes'
package:
name: stsci.sphere
@@ -23,7 +23,7 @@ requirements:
- numpy x.x
- python x.x
source:
- git_url: ssh://git@bitbucket.org/stsci_ssb/stsci.sphere
+ git_url: https://bitbucket.org/stsci_ssb/stsci.sphere
test:
imports:
- stsci.sphere
diff --git a/stsci/meta.yaml b/stsci/meta.yaml
index 6bea935..7cff403 100644
--- a/stsci/meta.yaml
+++ b/stsci/meta.yaml
@@ -3,7 +3,7 @@ about:
license: BSD
summary: stsci meta-package
build:
- number: '0'
+ number: '1'
package:
name: stsci
version: 1.0.0
@@ -12,37 +12,37 @@ requirements:
- stsci-hst
- stsci-data-analysis
- astropy >=1.1
- - cfitsio ==3.370
- - d2to1 ==0.2.12
- - ds9 ==7.4
- - fftw ==3.3.4
+ - cfitsio >=3.370
+ - d2to1 >=0.2.12
+ - ds9 >=7.1
+ - fftw >=3.3.4
- htc_utils >=0.1
- - imexam ==0.5.2
- - photutils ==0.2.1
- - poppy ==0.4.0
- - purge_path >=0.0.1
- - pyds9 ==1.8.1
- - pyfftw ==0.9.2
- - webbpsf ==0.4.0
- - webbpsf-data ==0.4.0
+ - imexam >=0.5.2
+ - photutils >=0.2.1
+ - poppy >=0.4.0
+ - purge_path >=1.0.0
+ - pyds9 >=1.8.1
+ - pyfftw >=0.9.2
+ - webbpsf >=0.4.0
+ - webbpsf-data >=0.4.0
- numpy x.x
- python x.x
run:
- stsci-hst
- stsci-data-analysis
- astropy >=1.1
- - cfitsio ==3.370
- - d2to1 ==0.2.12
- - ds9 ==7.4
- - fftw ==3.3.4
+ - cfitsio >=3.370
+ - d2to1 >=0.2.12
+ - ds9 >=7.1
+ - fftw >=3.3.4
- htc_utils >=0.1
- - imexam ==0.5.2
- - photutils ==0.2.1
- - poppy ==0.4.0
- - purge_path >=0.0.1
- - pyds9 ==1.8.1
- - pyfftw ==0.9.2
- - webbpsf ==0.4.0
- - webbpsf-data ==0.4.0
+ - imexam >=0.5.2
+ - photutils >=0.2.1
+ - poppy >=0.4.0
+ - purge_path >=1.0.0
+ - pyds9 >=1.8.1
+ - pyfftw >=0.9.2
+ - webbpsf >=0.4.0
+ - webbpsf-data >=0.4.0
- numpy x.x
- python x.x