diff options
-rw-r--r-- | asdf-standard/asdf-standard.ini | 2 | ||||
-rw-r--r-- | fftw/fftw.ini | 3 | ||||
-rw-r--r-- | pyfits/pyfits.ini | 2 | ||||
-rw-r--r-- | stsci-hst/stsci-hst.ini | 75 | ||||
-rw-r--r-- | stsci.ndimage/stsci.ndimage.ini | 2 | ||||
-rw-r--r-- | stsci.numdisplay/stsci.numdisplay.ini | 2 | ||||
-rw-r--r-- | stsci.sphere/stsci.sphere.ini | 2 | ||||
-rw-r--r-- | stsci.sphinxext/stsci.sphinxext.ini | 2 | ||||
-rw-r--r-- | stsci/stsci.ini | 80 |
9 files changed, 91 insertions, 79 deletions
diff --git a/asdf-standard/asdf-standard.ini b/asdf-standard/asdf-standard.ini index 0adb20b..da29466 100644 --- a/asdf-standard/asdf-standard.ini +++ b/asdf-standard/asdf-standard.ini @@ -22,7 +22,7 @@ build: jsonschema pyyaml mistune - six [py27|py34] + six [py27|py3k] setuptools python diff --git a/fftw/fftw.ini b/fftw/fftw.ini index f1454a1..177551c 100644 --- a/fftw/fftw.ini +++ b/fftw/fftw.ini @@ -16,7 +16,8 @@ number : 4 [requirements] build : - gcc >=4.6 [osx] + gcc 4.6 [osx] + gcc 4.6 [linux] run : pkgconfig diff --git a/pyfits/pyfits.ini b/pyfits/pyfits.ini index fac2058..237635e 100644 --- a/pyfits/pyfits.ini +++ b/pyfits/pyfits.ini @@ -11,7 +11,7 @@ summary: ${package:name} git_url: ${about:home}.git patches: - ${package:name}-cfitsio.patch [py34] + ${package:name}-cfitsio.patch [py3k] [build] number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} diff --git a/stsci-hst/stsci-hst.ini b/stsci-hst/stsci-hst.ini index f2a5183..f8154e8 100644 --- a/stsci-hst/stsci-hst.ini +++ b/stsci-hst/stsci-hst.ini @@ -19,72 +19,83 @@ build : ${requirements:run} run : # Extra - purge_path [py34] + purge_path [py3k] purge_path [py27] # HST - acstools [py34] + acstools [py3k] acstools [py27] - astrolib.coords [py34] + astrolib.coords [py3k] astrolib.coords [py27] # pyfits MUST come before astropy... dependency nightmare - pyfits [py34] + pyfits [py3k] pyfits [py27] # astropy MUST come after pyfits... see also pyfits - astropy [py34] + astropy [py3k] astropy [py27] - calcos [py34] + calcos [py3k] calcos [py27] - costools [py34] + costools [py3k] costools [py27] - d2to1 [py34] + crds [py3k] + crds [py27] + d2to1 [py3k] d2to1 [py27] - fitsblender [py34] + drizzlepac [py3k] + drizzlepac [py27] + fitsblender [py3k] fitsblender [py27] - hstcal [py34] - hstcal [py27] - nictools [py34] + # Broken at the moment :( + #hstcal [py3k] + #hstcal [py27] + nictools [py3k] nictools [py27] - pysynphot [py34] + pyregion [py3k] + pyregion [py27] + pysynphot [py3k] pysynphot [py27] - pywcs [py34] + pywcs [py3k] pywcs [py27] - reftools [py34] + reftools [py3k] reftools [py27] - stistools [py34] + stistools [py3k] stistools [py27] - stsci.convolve [py34] + stsci.convolve [py3k] stsci.convolve [py27] - stsci.distutils [py34] + stsci.distutils [py3k] stsci.distutils [py27] - stsci.image [py34] + stsci.image [py3k] stsci.image [py27] - stsci.imagemanip [py34] + stsci.imagemanip [py3k] stsci.imagemanip [py27] - stsci.imagestats [py34] + stsci.imagestats [py3k] stsci.imagestats [py27] - stsci.ndimage [py34] + stsci.ndimage [py3k] stsci.ndimage [py27] - stsci.sphinxext [py34] + stsci.numdisplay [py3k] + stsci.numdisplay [py27] + stsci.sphinxext [py3k] stsci.sphinxext [py27] - stsci.stimage [py34] + stsci.stimage [py3k] stsci.stimage [py27] - stsci.skypac [py34] + stsci.skypac [py3k] stsci.skypac [py27] - stsci.tools [py34] + stsci.sphere [py3k] + stsci.sphere [py27] + stsci.tools [py3k] stsci.tools [py27] - stwcs [py34] + stwcs [py3k] stwcs [py27] - wfpc2tools [py34] + wfpc2tools [py3k] wfpc2tools [py27] - wfc3tools [py34] + wfc3tools [py3k] wfc3tools [py27] #Standard - anaconda [py34] + anaconda [py3k] anaconda [py27] - numpy [py34] + numpy [py3k] numpy [py27] - python [py34] + python [py3k] python [py27] [test] diff --git a/stsci.ndimage/stsci.ndimage.ini b/stsci.ndimage/stsci.ndimage.ini index 220665d..d566326 100644 --- a/stsci.ndimage/stsci.ndimage.ini +++ b/stsci.ndimage/stsci.ndimage.ini @@ -13,7 +13,7 @@ git_url: ssh://git@bitbucket.org/stsci_ssb/${package:name} [build] number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} # Namespace package workaround -preserve_egg_dir: no +preserve_egg_dir: yes [requirements] build: diff --git a/stsci.numdisplay/stsci.numdisplay.ini b/stsci.numdisplay/stsci.numdisplay.ini index 0e1991b..8905890 100644 --- a/stsci.numdisplay/stsci.numdisplay.ini +++ b/stsci.numdisplay/stsci.numdisplay.ini @@ -14,7 +14,7 @@ git_url: ssh://git@bitbucket.org/stsci_ssb/${package:name} [build] number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} # Namespace package workaround -preserve_egg_dir: no +preserve_egg_dir: yes [requirements] build: diff --git a/stsci.sphere/stsci.sphere.ini b/stsci.sphere/stsci.sphere.ini index 9a006c6..924084a 100644 --- a/stsci.sphere/stsci.sphere.ini +++ b/stsci.sphere/stsci.sphere.ini @@ -13,7 +13,7 @@ git_url: ssh://git@bitbucket.org/stsci_ssb/${package:name} [build] number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} # Namespace package workaround -preserve_egg_dir: no +preserve_egg_dir: yes [requirements] build: diff --git a/stsci.sphinxext/stsci.sphinxext.ini b/stsci.sphinxext/stsci.sphinxext.ini index eba3b67..ad54e45 100644 --- a/stsci.sphinxext/stsci.sphinxext.ini +++ b/stsci.sphinxext/stsci.sphinxext.ini @@ -16,7 +16,7 @@ md5: d23f6ad057a4af86a6ce3771bddb1754 [build] number: 1 # Namespace package workaround -preserve_egg_dir: no +preserve_egg_dir: yes [requirements] build: diff --git a/stsci/stsci.ini b/stsci/stsci.ini index ec72d47..79471d7 100644 --- a/stsci/stsci.ini +++ b/stsci/stsci.ini @@ -19,84 +19,84 @@ build : ${requirements:run} run : #STScI - acstools [py34] + acstools [py3k] acstools [py27] - asdf-standard [py34] + asdf-standard [py3k] asdf-standard [py27] - astrolib.coords [py34] + astrolib.coords [py3k] astrolib.coords [py27] - astropy [py34] + astropy [py3k] astropy [py27] - astropy-helpers [py34] + astropy-helpers [py3k] astropy-helpers [py27] - calcos [py34] + calcos [py3k] calcos [py27] cfitsio - d2to1 [py34] + d2to1 [py3k] d2to1 [py27] - #drizzle [py34] + #drizzle [py3k] drizzle [py27] ds9 fftw - fitsblender [py34] + fitsblender [py3k] fitsblender [py27] - hstcal [py34] + hstcal [py3k] hstcal [py27] - htc_utils [py34] + htc_utils [py3k] htc_utils [py27] - imexam [py34] + imexam [py3k] imexam [py27] - nictools [py34] + nictools [py3k] nictools [py27] - #photutils [py34] + #photutils [py3k] photutils [py27] - poppy [py34] + poppy [py3k] poppy [py27] - purge_path [py34] + purge_path [py3k] purge_path [py27] - pyasdf [py34] + pyasdf [py3k] pyasdf [py27] - pydrizzle [py34] + pydrizzle [py3k] pydrizzle [py27] - pyfftw [py34] + pyfftw [py3k] pyfftw [py27] - pyfits [py34] + pyfits [py3k] pyfits [py27] #pyqtgraph #issues with building - #pysynphot [py34] + #pysynphot [py3k] pysynphot [py27] - pywcs [py34] + pywcs [py3k] pywcs [py27] - #reftools [py34] + #reftools [py3k] reftools [py27] - stistools [py34] + stistools [py3k] stistools [py27] - stsci.convolve [py34] + stsci.convolve [py3k] stsci.convolve [py27] - stsci.distutils [py34] + stsci.distutils [py3k] stsci.distutils [py27] - stsci.image [py34] + stsci.image [py3k] stsci.image [py27] - stsci.imagemanip [py34] + stsci.imagemanip [py3k] stsci.imagemanip [py27] - stsci.imagestats [py34] + stsci.imagestats [py3k] stsci.imagestats [py27] - stsci.ndimage [py34] + stsci.ndimage [py3k] stsci.ndimage [py27] - stsci.sphinxext [py34] + stsci.sphinxext [py3k] stsci.sphinxext [py27] - stsci.stimage [py34] + stsci.stimage [py3k] stsci.stimage [py27] - stsci.tools [py34] + stsci.tools [py3k] stsci.tools [py27] - stwcs [py34] + stwcs [py3k] stwcs [py27] - webbpsf [py34] + webbpsf [py3k] webbpsf [py27] - wfpc2tools [py34] + wfpc2tools [py3k] wfpc2tools [py27] - wfc3tools [py34] + wfc3tools [py3k] wfc3tools [py27] @@ -107,11 +107,11 @@ run : sextractor [linux] #Standard - anaconda [py34] + anaconda [py3k] anaconda [py27] - numpy [py34] + numpy [py3k] numpy [py27] - python [py34] + python [py3k] python [py27] [test] |