From e5bf0cbe7eb556d4aa217bf25dc12229d5a4719e Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Tue, 11 Aug 2015 13:48:48 -0400 Subject: Fix empty GIT_DESCRIBE_TAG default (0.0.0) --- acstools/acstools.ini | 2 +- aprio/aprio.ini | 2 +- asdf-standard/asdf-standard.ini | 2 +- astropy-helpers/astropy-helpers.ini | 2 +- astropy/astropy.ini | 2 +- d2to1/d2to1.ini | 2 +- fftw/fftw.ini | 2 +- imutils/imutils.ini | 2 +- photutils/photutils.ini | 2 +- poppy/poppy.ini | 2 +- pydrizzle/pydrizzle.ini | 2 +- pyfftw/pyfftw.ini | 17 +++++++++-------- pyfits/pyfits.ini | 2 +- pysynphot/pysynphot.ini | 2 +- reftools/reftools.ini | 2 +- stistools/stistools.ini | 2 +- stsci.convolve/stsci.convolve.ini | 2 +- stsci.distutils/stsci.distutils.ini | 2 +- stsci.image/stsci.image.ini | 2 +- stsci.imagemanip/stsci.imagemanip.ini | 2 +- stsci.imagestats/stsci.imagestats.ini | 2 +- stsci.ndimage/stsci.ndimage.ini | 2 +- stsci.numdisplay/stsci.numdisplay.ini | 2 +- stsci.stimage/stsci.stimage.ini | 2 +- stsci.tools/stsci.tools.ini | 2 +- webbpsf/webbpsf.ini | 2 +- 26 files changed, 34 insertions(+), 33 deletions(-) diff --git a/acstools/acstools.ini b/acstools/acstools.ini index 3769d78..8e71f1a 100644 --- a/acstools/acstools.ini +++ b/acstools/acstools.ini @@ -1,6 +1,6 @@ [package] name: acstools -version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git +version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git [about] home: http://www.stsci.edu/institute/software_hardware/pyraf/stsci_python diff --git a/aprio/aprio.ini b/aprio/aprio.ini index 7b27c86..4a2937d 100644 --- a/aprio/aprio.ini +++ b/aprio/aprio.ini @@ -1,6 +1,6 @@ [package] name: aprio -version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git +version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git [about] home: http://bitbucket.org/jhunkeler/${package:name} diff --git a/asdf-standard/asdf-standard.ini b/asdf-standard/asdf-standard.ini index 4fac4f3..cd97145 100644 --- a/asdf-standard/asdf-standard.ini +++ b/asdf-standard/asdf-standard.ini @@ -1,6 +1,6 @@ [package] name: asdf-standard -version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0") }}.git +version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git [about] home: http://github.com/spacetelescope/${package:name} diff --git a/astropy-helpers/astropy-helpers.ini b/astropy-helpers/astropy-helpers.ini index 6bed0f6..e503e6a 100644 --- a/astropy-helpers/astropy-helpers.ini +++ b/astropy-helpers/astropy-helpers.ini @@ -1,6 +1,6 @@ [package] name: astropy-helpers -version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0") }}.git +version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git [about] home: http://github.com/astropy/${package:name} diff --git a/astropy/astropy.ini b/astropy/astropy.ini index 067bae8..2de1f40 100644 --- a/astropy/astropy.ini +++ b/astropy/astropy.ini @@ -1,6 +1,6 @@ [package] name: astropy -version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git +version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git [about] home: http://github.com/astropy/${package:name} diff --git a/d2to1/d2to1.ini b/d2to1/d2to1.ini index 37de38b..608518d 100644 --- a/d2to1/d2to1.ini +++ b/d2to1/d2to1.ini @@ -1,6 +1,6 @@ [package] name: d2to1 -version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git +version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git [about] home: https://github.com/embray/${package:name} diff --git a/fftw/fftw.ini b/fftw/fftw.ini index c8ab085..4444ec7 100644 --- a/fftw/fftw.ini +++ b/fftw/fftw.ini @@ -18,7 +18,7 @@ number : 0 build : #none run : - #none + #none [cbc_build] linux : diff --git a/imutils/imutils.ini b/imutils/imutils.ini index b78fa2e..b329f59 100644 --- a/imutils/imutils.ini +++ b/imutils/imutils.ini @@ -1,6 +1,6 @@ [package] name: imutils -version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0") }}.git +version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git [about] home: http://github.com/spacetelescope/${package:name} diff --git a/photutils/photutils.ini b/photutils/photutils.ini index 4c4b1ff..7fcfc73 100644 --- a/photutils/photutils.ini +++ b/photutils/photutils.ini @@ -1,6 +1,6 @@ [package] name: photutils -version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git +version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git [about] home: http://github.com/astropy/${package:name} diff --git a/poppy/poppy.ini b/poppy/poppy.ini index 06a1730..185c394 100644 --- a/poppy/poppy.ini +++ b/poppy/poppy.ini @@ -1,6 +1,6 @@ [package] name: poppy -version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git +version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git [about] home: http://github.com/mperrin/${package:name} diff --git a/pydrizzle/pydrizzle.ini b/pydrizzle/pydrizzle.ini index fe5b556..9d4c102 100644 --- a/pydrizzle/pydrizzle.ini +++ b/pydrizzle/pydrizzle.ini @@ -1,6 +1,6 @@ [package] name: pydrizzle -version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git +version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git [about] home: http://www.stsci.edu/institute/software_hardware/pyraf/stsci_python diff --git a/pyfftw/pyfftw.ini b/pyfftw/pyfftw.ini index 0f0c4b5..97ce1d9 100644 --- a/pyfftw/pyfftw.ini +++ b/pyfftw/pyfftw.ini @@ -17,19 +17,20 @@ number : 0 [requirements] build : - numpy + numpy >=1.9 fftw - setuptools - python + setuptools + python run : - numpy + numpy >=1.9 fftw - python + python [cbc_build] linux : - python setup.py install || exit 1 + python setup.py install || exit 1 + windows : - python setup.py install - if errorlevel 1 exit 1 + python setup.py install + if errorlevel 1 exit 1 diff --git a/pyfits/pyfits.ini b/pyfits/pyfits.ini index 27a0b59..7a0d571 100644 --- a/pyfits/pyfits.ini +++ b/pyfits/pyfits.ini @@ -1,6 +1,6 @@ [package] name: pyfits -version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git +version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git [about] home: https://github.com/spacetelescope/${package:name} diff --git a/pysynphot/pysynphot.ini b/pysynphot/pysynphot.ini index 792e827..ad0b999 100644 --- a/pysynphot/pysynphot.ini +++ b/pysynphot/pysynphot.ini @@ -1,6 +1,6 @@ [package] name: pysynphot -version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git +version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git [about] home: ssh://git@bitbucket.org/stsci_ssb/${package:name} diff --git a/reftools/reftools.ini b/reftools/reftools.ini index 6245c19..aa7c5ee 100644 --- a/reftools/reftools.ini +++ b/reftools/reftools.ini @@ -1,6 +1,6 @@ [package] name: reftools -version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git +version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git [about] home: http://www.stsci.edu/institute/software_hardware/pyraf/stsci_python diff --git a/stistools/stistools.ini b/stistools/stistools.ini index 32b40b4..42470be 100644 --- a/stistools/stistools.ini +++ b/stistools/stistools.ini @@ -1,6 +1,6 @@ [package] name: stistools -version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git +version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git [about] home: http://www.stsci.edu/institute/software_hardware/pyraf/stsci_python diff --git a/stsci.convolve/stsci.convolve.ini b/stsci.convolve/stsci.convolve.ini index bda143d..2f29e76 100644 --- a/stsci.convolve/stsci.convolve.ini +++ b/stsci.convolve/stsci.convolve.ini @@ -1,6 +1,6 @@ [package] name: stsci.convolve -version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git +version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git [about] home: https://github.com/embray/${package:name} diff --git a/stsci.distutils/stsci.distutils.ini b/stsci.distutils/stsci.distutils.ini index 7bc3bf9..ca8b41c 100644 --- a/stsci.distutils/stsci.distutils.ini +++ b/stsci.distutils/stsci.distutils.ini @@ -1,6 +1,6 @@ [package] name: stsci.distutils -version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git +version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git [about] home: https://github.com/embray/${package:name} diff --git a/stsci.image/stsci.image.ini b/stsci.image/stsci.image.ini index b8406bc..ddf27e6 100644 --- a/stsci.image/stsci.image.ini +++ b/stsci.image/stsci.image.ini @@ -1,6 +1,6 @@ [package] name: stsci.image -version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git +version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git [about] home: https://github.com/embray/${package:name} diff --git a/stsci.imagemanip/stsci.imagemanip.ini b/stsci.imagemanip/stsci.imagemanip.ini index 33825d1..25595cc 100644 --- a/stsci.imagemanip/stsci.imagemanip.ini +++ b/stsci.imagemanip/stsci.imagemanip.ini @@ -1,6 +1,6 @@ [package] name: stsci.imagemanip -version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git +version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git [about] home: https://github.com/embray/${package:name} diff --git a/stsci.imagestats/stsci.imagestats.ini b/stsci.imagestats/stsci.imagestats.ini index d119de7..0cda9e0 100644 --- a/stsci.imagestats/stsci.imagestats.ini +++ b/stsci.imagestats/stsci.imagestats.ini @@ -1,6 +1,6 @@ [package] name: stsci.imagestats -version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git +version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git [about] home: https://github.com/embray/${package:name} diff --git a/stsci.ndimage/stsci.ndimage.ini b/stsci.ndimage/stsci.ndimage.ini index bb73792..220665d 100644 --- a/stsci.ndimage/stsci.ndimage.ini +++ b/stsci.ndimage/stsci.ndimage.ini @@ -1,6 +1,6 @@ [package] name: stsci.ndimage -version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git +version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git [about] home: https://github.com/embray/${package:name} diff --git a/stsci.numdisplay/stsci.numdisplay.ini b/stsci.numdisplay/stsci.numdisplay.ini index 675d1a7..0e1991b 100644 --- a/stsci.numdisplay/stsci.numdisplay.ini +++ b/stsci.numdisplay/stsci.numdisplay.ini @@ -1,6 +1,6 @@ [package] name: stsci.numdisplay -version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git +version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git [about] home: https://github.com/embray/${package:name} diff --git a/stsci.stimage/stsci.stimage.ini b/stsci.stimage/stsci.stimage.ini index 49576ba..4b233e9 100644 --- a/stsci.stimage/stsci.stimage.ini +++ b/stsci.stimage/stsci.stimage.ini @@ -1,6 +1,6 @@ [package] name: stsci.stimage -version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git +version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git [about] home: https://github.com/embray/${package:name} diff --git a/stsci.tools/stsci.tools.ini b/stsci.tools/stsci.tools.ini index 943f053..1d17051 100644 --- a/stsci.tools/stsci.tools.ini +++ b/stsci.tools/stsci.tools.ini @@ -1,6 +1,6 @@ [package] name: stsci.tools -version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git +version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git [about] home: https://github.com/embray/${package:name} diff --git a/webbpsf/webbpsf.ini b/webbpsf/webbpsf.ini index 64969ac..c6992c4 100644 --- a/webbpsf/webbpsf.ini +++ b/webbpsf/webbpsf.ini @@ -1,6 +1,6 @@ [package] name: webbpsf -version: {{ environ.get("GIT_DESCRIBE_TAG", "") }}.git +version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git [about] home: http://github.com/mperrin/${package:name} -- cgit From 45643d2ded2720d6035ee321b8b8bd8fa8ba7ff2 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Fri, 14 Aug 2015 14:47:24 -0400 Subject: Initial commit of iraf-src recipe (non-working) --- iraf-src/.iraf.ini.swp | Bin 0 -> 12288 bytes iraf-src/iraf.ini | 114 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 114 insertions(+) create mode 100644 iraf-src/.iraf.ini.swp create mode 100644 iraf-src/iraf.ini diff --git a/iraf-src/.iraf.ini.swp b/iraf-src/.iraf.ini.swp new file mode 100644 index 0000000..b70a9a4 Binary files /dev/null and b/iraf-src/.iraf.ini.swp differ diff --git a/iraf-src/iraf.ini b/iraf-src/iraf.ini new file mode 100644 index 0000000..45f7540 --- /dev/null +++ b/iraf-src/iraf.ini @@ -0,0 +1,114 @@ +[package] +name: iraf +version: 2.16.1 + +[about] +home: http://iraf.noao.edu +license: MIT +summary: NOAO Image Reduction and Analysis Facility + +[source] +# Remember, always 32-bit! Now feast upon my tears. +#fn: ${package:name}.lnux.x86.fixup.tar.gz +#url: ${cbc_cgi:url}/${fn} +git_url: ssh://git@bitbucket.org/jhunkeler/${package:name}-src + +# Tarball should be generated with: +# git archive --format tar.gz --prefix iraf/ -o ../iraf.lnux.x86.fixup.tar.gz -v master + +[build] +number: 1 +detect_binary_files_with_prefix: True + +[requirements] +build: + # Luck +run: + # Gallant effort + +[cbc_build] +linux: + export TERM=xterm + export iraf=$$PREFIX/iraf/ + export IRAFARCH=macosx + + cp -a `pwd` $$PREFIX/iraf + cd $$PREFIX/iraf + + export FAKEHOME=$$PREFIX/iraf/fakehome + mkdir -p $$FAKEHOME + + ./install \ + --accept-defaults \ + --fakehome $$FAKEHOME \ + --term xterm \ + --mach $$IRAFARCH \ + --bindir $$FAKEHOME/bin \ + --cache $$FAKEHOME/cache \ + --imdir $$FAKEHOME/imdir \ + --no-errors + + sed -i -e "s|exit|return|g" unix/hlib/irafuser.* + source unix/hlib/irafuser.sh + # Fix me? why did i unset it? + export FAKEHOME=$$PREFIX/iraf/fakehome + + mkdir -p bin.generic + mkdir -p bin.$$IRAFARCH + mkdir -p noao/bin.$IRAFARCH + mkdir -p vo/bin.$IRAFARCH + mkdir -p unix/as.generic + set -x + find . -lname '/iraf/iraf/*' \ + -exec sh -c 'ln -snf \ + "$$(readlink "$$0" \ + | sed -e "s|/iraf/iraf|../..|" -e "s|/as/|/as.$$IRAFARCH/|")" "$$0"' {} \; + + find "$$iraf" -type f \ + \( -name "*.c" \ + -o -name "*.f" \ + -o -name "*.h" \ + #-o -name "*.x" \ + -o -name "*.sh" \ + -o -name "*.csh" \ + -o -name "*akefile*" \ + -o -name "*install*" \) \ + -exec sed -i -e "s|/iraf/iraf|$$PREFIX/iraf|g" '{}' \; + + export CFLAGS="-arch i386 -m32 -I$$FAKEHOME/ -I$$iraf/bin" + export LDFLAGS="-arch i386" + + mkdir -p override + ln -sf /usr/bin/libtool override/ + ln -sf /usr/bin/ranlib override/ + export PATH=$$iraf/override:$$PATH + + rm -rf include + mkdir -p include + + #ln -s ../unix/hlib/libc/iraf.h $$FAKEHOME/ + ln -s ../unix/bin/f2c.h $$FAKEHOME/ + cp $$iraf/unix/hlib/libc/vosproto.h $$FAKEHOME/ + cp $$iraf/unix/boot/xyacc/yaccpar.x $$FAKEHOME/ + + touch $$iraf/extern/.zzsetenv.def + + echo '$$set XFLAGS = "$$(XFLAGS) -/I$$(iraf)fakehome -/I$$(iraf)include"' >> unix/hlib/mkpkg.inc + echo '$$set XVFLAGS = "$$(XVFLAGS) -/I$$(iraf)fakehome -/I$$(iraf)include"' >> unix/hlib/mkpkg.inc + echo '$$set LFLAGS = "$$(LFLAGS) -/I$$(iraf)fakehome -/I$$(iraf)include" -/L$$(iraf)bin -/$$(iraf)bin.$$(IRAFARCH)' >> unix/hlib/mkpkg.inc + + ( cd unix/f2c/src && \ + make -f makefile.u CFLAGS="$$CFLAGS" LDFLAGS="$$LDFLAGS" && \ + cp f2c $$iraf/unix/bin.$$IRAFARCH/f2c.e ) + + ( cd unix/f2c/libf2c && \ + make -f makefile.u CFLAGS="$$CFLAGS" LDFLAGS="$$LDFLAGS" && \ + cp f2c.h libf2c.a $$iraf/unix/bin.$$IRAFARCH/ ) + + ( make $$IRAFARCH ) + + ( util/mksysgen ) + +windows: + echo Not supported on Windows + -- cgit From 5fb4ca58d22c76fa026e13cc2e37c11eab01a8c8 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Fri, 14 Aug 2015 14:49:26 -0400 Subject: Ignore vim swap files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 0335979..3d717aa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .*project .index.json +*.swp -- cgit From 036ed11359ae693280566ac27e15abaacf383c14 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Fri, 14 Aug 2015 14:49:56 -0400 Subject: Fail --- iraf-src/.iraf.ini.swp | Bin 12288 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 iraf-src/.iraf.ini.swp diff --git a/iraf-src/.iraf.ini.swp b/iraf-src/.iraf.ini.swp deleted file mode 100644 index b70a9a4..0000000 Binary files a/iraf-src/.iraf.ini.swp and /dev/null differ -- cgit From 24a35de9b3cd1fc8d2556f4e02a7692d399381af Mon Sep 17 00:00:00 2001 From: Joe Hunkeler Date: Wed, 19 Aug 2015 16:37:20 -0400 Subject: More changes that change nothing --- iraf-src/iraf.ini | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/iraf-src/iraf.ini b/iraf-src/iraf.ini index 45f7540..7a14ccb 100644 --- a/iraf-src/iraf.ini +++ b/iraf-src/iraf.ini @@ -18,7 +18,7 @@ git_url: ssh://git@bitbucket.org/jhunkeler/${package:name}-src [build] number: 1 -detect_binary_files_with_prefix: True +#detect_binary_files_with_prefix: True [requirements] build: @@ -55,10 +55,7 @@ linux: mkdir -p bin.generic mkdir -p bin.$$IRAFARCH - mkdir -p noao/bin.$IRAFARCH - mkdir -p vo/bin.$IRAFARCH - mkdir -p unix/as.generic - set -x + find . -lname '/iraf/iraf/*' \ -exec sh -c 'ln -snf \ "$$(readlink "$$0" \ @@ -68,14 +65,18 @@ linux: \( -name "*.c" \ -o -name "*.f" \ -o -name "*.h" \ - #-o -name "*.x" \ - -o -name "*.sh" \ - -o -name "*.csh" \ + -o -name "*.x" \ + -o -name "*.sh*" \ + -o -name "*.csh*" \ -o -name "*akefile*" \ + -o -name "*mkpkg*" \ + -o -name "*mklibs*" \ + -o -name "*mkbase*" \ + -o -name "*zzsetenv.def*" \ -o -name "*install*" \) \ -exec sed -i -e "s|/iraf/iraf|$$PREFIX/iraf|g" '{}' \; - export CFLAGS="-arch i386 -m32 -I$$FAKEHOME/ -I$$iraf/bin" + export CFLAGS="-arch i386 -m32 -I$$FAKEHOME/ -I $$iraf/include -I$$iraf/bin" export LDFLAGS="-arch i386" mkdir -p override @@ -87,15 +88,17 @@ linux: mkdir -p include #ln -s ../unix/hlib/libc/iraf.h $$FAKEHOME/ - ln -s ../unix/bin/f2c.h $$FAKEHOME/ - cp $$iraf/unix/hlib/libc/vosproto.h $$FAKEHOME/ - cp $$iraf/unix/boot/xyacc/yaccpar.x $$FAKEHOME/ + ln -s ../unix/hlib/libc/iraf.h $$iraf/include/ + ln -s ../unix/bin/f2c.h $$iraf/include/ + cp $$iraf/unix/hlib/libc/vosproto.h $$iraf/include/ + cp $$iraf/unix/boot/xyacc/yaccpar.x $$iraf/include/ + mkdir -p $$iraf/include/curl && touch $$iraf/include/curl/types.h touch $$iraf/extern/.zzsetenv.def - echo '$$set XFLAGS = "$$(XFLAGS) -/I$$(iraf)fakehome -/I$$(iraf)include"' >> unix/hlib/mkpkg.inc - echo '$$set XVFLAGS = "$$(XVFLAGS) -/I$$(iraf)fakehome -/I$$(iraf)include"' >> unix/hlib/mkpkg.inc - echo '$$set LFLAGS = "$$(LFLAGS) -/I$$(iraf)fakehome -/I$$(iraf)include" -/L$$(iraf)bin -/$$(iraf)bin.$$(IRAFARCH)' >> unix/hlib/mkpkg.inc + echo '$$set XFLAGS = "$$(XFLAGS) -/I$$(iraf)fakehome -/I$$(iraf)include"' >> unix/hlib/mkpkg.inc + echo '$$set XVFLAGS = "$$(XVFLAGS) -/I$$(iraf)fakehome -/I$$(iraf)include"' >> unix/hlib/mkpkg.inc + echo '$$set LFLAGS = "$$(LFLAGS) -/I$$(iraf)fakehome -/I$$(iraf)include" -/L$$(iraf)bin -/$$(iraf)bin.$$(IRAFARCH)' >> unix/hlib/mkpkg.inc ( cd unix/f2c/src && \ make -f makefile.u CFLAGS="$$CFLAGS" LDFLAGS="$$LDFLAGS" && \ @@ -105,9 +108,8 @@ linux: make -f makefile.u CFLAGS="$$CFLAGS" LDFLAGS="$$LDFLAGS" && \ cp f2c.h libf2c.a $$iraf/unix/bin.$$IRAFARCH/ ) - ( make $$IRAFARCH ) - - ( util/mksysgen ) + ( make $$IRAFARCH && \ + util/mksysgen ) windows: echo Not supported on Windows -- cgit From 99af88729778e202ee8d1c3b1e83d70f2dae88a8 Mon Sep 17 00:00:00 2001 From: Joe Hunkeler Date: Wed, 19 Aug 2015 17:00:12 -0400 Subject: Add iraf-stsci testing package --- iraf-stsci/iraf.ini | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 iraf-stsci/iraf.ini diff --git a/iraf-stsci/iraf.ini b/iraf-stsci/iraf.ini new file mode 100644 index 0000000..2ca77b5 --- /dev/null +++ b/iraf-stsci/iraf.ini @@ -0,0 +1,53 @@ +[package] +name: iraf +version: 2.16.1 + +[about] +home: http://iraf.noao.edu +license: MIT +summary: NOAO Image Reduction and Analysis Facility + +[source] +# Remember, always 32-bit! Now feast upon my tears. +#fn: ${package:name}.lnux.x86.fixup.tar.gz +#url: ${cbc_cgi:url}/${fn} +git_url: ssh://git@bitbucket.org/jhunkeler/${package:name}-stsci + +[build] +number: 1 +detect_binary_files_with_prefix: True + +[requirements] +build: + # Luck + gcc +run: + # Gallant effort + +[cbc_build] +linux: + export TERM=xterm + export PATH=`purge_path /sw` + export FAKEHOME=$$PREFIX/iraf/fakehome + export IRAFARCH=macosx + export CFLAGS="-m32 -arch i386" + export LDFLAGS="-m32 -arch i386" + cp -a `pwd` $$PREFIX/iraf + cd $$PREFIX/iraf + #mkdir override_sysutil + #( cd override_sysutil \ + # && ln -s /usr/bin/libtool \ + # && ln -s /usr/bin/ranlib \ + # && ln -s /usr/bin/ld ) + #export PATH=`pwd`/override_sysutil:$$PATH + + mkdir sm_logs + export sm_logs=`pwd`/sm_logs + + mkdir -p $$FAKEHOME/cache + export SHELL=/bin/tcsh + ./build + export SHELL=/bin/bash + +windows: + echo Not supported on Windows -- cgit From 7e99bb54098d675212296604a84a03a4c18af9ab Mon Sep 17 00:00:00 2001 From: Joe Hunkeler Date: Fri, 21 Aug 2015 15:42:27 -0400 Subject: It lives... --- iraf-all/iraf.ini | 125 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 125 insertions(+) create mode 100644 iraf-all/iraf.ini diff --git a/iraf-all/iraf.ini b/iraf-all/iraf.ini new file mode 100644 index 0000000..667c26e --- /dev/null +++ b/iraf-all/iraf.ini @@ -0,0 +1,125 @@ +[package] +name: iraf +version: 2.16.1 + +[about] +home: http://iraf.noao.edu +license: MIT +summary: NOAO Image Reduction and Analysis Facility + +[source] +# Remember, always 32-bit! Now feast upon my tears. +#fn: ${package:name}.lnux.x86.fixup.tar.gz +#url: ${cbc_cgi:url}/${fn} +#git_url: ssh://git@bitbucket.org/jhunkeler/${package:name}-all +git_url: file:///users/shared/${package:name}-metal + + +[build] +number: 1 +#detect_binary_files_with_prefix: True + +[requirements] +build: + # Luck + purge_path +run: + purge_path + # Gallant effort + +[cbc_build] +linux: + set -x + #always 32-bit... always + export IRAFARCH='' + export target=`uname`.32 + case "$$target" in + Linux.32) + export IRAFARCH='linux' + export CFLAGS="-m32" + export LDFLAGS="-m32" + ;; + Darwin.32) + export IRAFARCH='macosx' + export CFLAGS="-m32 -arch i386" + export LDFLAGS="-m32 -arch i386" + ( cd vendor/x11iraf && ln -sf bin.macintel bin.macosx ) + ( cd vendor/x11iraf && ln -sf lib.macintel lib.macosx ) + ;; + *) + echo "UNSUPPORTED ARCHITECTURE (64-bit disabled, by the way...)" + exit 1 + ;; + esac + + echo "Purging non-architecture files from distribution:" + find \( -name "bin.*" \( -not -name "bin.$$IRAFARCH" \) -and \( -not -name "bin.generic" \) -and -not -path "*vendor/x11iraf/*" \) | xargs -n1 -I{} rm -rf "{}" + + export TERM=xterm + export PATH=`purge_path /sw` + export iraf=$$PREFIX/iraf/ + export FAKEHOME=$$PREFIX/iraf-runtime + + mkdir -p $$iraf + mkdir -p $$FAKEHOME/{bin,cache,imdir} + rsync -aH `pwd`/ $$iraf + cd $$iraf + + yes '' | ./install_not_broken \ + --bindir $$FAKEHOME/bin \ + --cache $$FAKEHOME/cache \ + --imdir $$FAKEHOME/imdir \ + --root $$iraf \ + --mach macosx + + find . -lname '/iraf/iraf/*' \ + -exec sh -c 'echo Re-linking "$$0" ;\ + ln -snf "$$(readlink "$$0" \ + | sed -e "s|/iraf/iraf|../..|" -e "s|/as/|/as.$$IRAFARCH/|")" "$$0"' {} \; + + gzip -9 unix/bin.macosx/sgi2ueps.e + rm -f unix/bin.macosx/sgi2ueps.e + + gzip -9 unix/bin.macosx/sgi2uapl.e + rm -f unix/bin.macosx/sgi2uapl.e + + mkdir -p $$PREFIX/etc/conda/{activate.d,deactivate.d} + + echo " + export iraf=$$PREFIX/iraf/ + export IRAFARCH=$$IRAFARCH + source \$$iraf/unix/hlib/irafuser.sh + export PATH="\$$iraf/../iraf-runtime/bin:\$$iraf/bin.\$$IRAFARCH:\$$PATH" + " > $$PREFIX/etc/conda/activate.d/iraf.sh + + echo ' + export PATH=`purge_path iraf-runtime` + export PATH=`purge_path $$iraf/bin.$$IRAFARCH:$$PATH` + unset iraf + unset IRAFARCH + unset IMTOOLRC + unset F2C + unset F77 + unset HSI_LIBS + unset hbin + unset hlib + unset host + unset CC + unset CC_f2c + unset HSI_CF + unset HSI_F77LIBS + unset HSI_FF + unset HSI_LF + unset HSI_LFLAGS + unset HSI_OSLIBS + unset HSI_XF + unset MACH + unset OS_MACH + unset RANLIB + unset hostid + unset tmp + unset GVBINDIR + ' > $$PREFIX/etc/conda/deactivate.d/iraf.sh + +windows: + echo Not supported on Windows -- cgit From f42be659677675e1d0de32f0b4b121fcf184baca Mon Sep 17 00:00:00 2001 From: Joe Hunkeler Date: Tue, 25 Aug 2015 10:20:21 -0400 Subject: Initial commit --- astrolib.coords/astrolib.coords.ini | 41 +++++++++++++++++++++++++++ atlas/atlas-generic.ini | 56 +++++++++++++++++++++++++++++++++++++ calcos/calcos.ini | 46 ++++++++++++++++++++++++++++++ ds9/ds9.ini | 45 +++++++++++++++++++++++++++++ purge_path/purge_path.ini | 31 ++++++++++++++++++++ sextractor/sextractor.ini | 39 ++++++++++++++++++++++++++ stwcs/stwcs.ini | 46 ++++++++++++++++++++++++++++++ 7 files changed, 304 insertions(+) create mode 100644 astrolib.coords/astrolib.coords.ini create mode 100644 atlas/atlas-generic.ini create mode 100644 calcos/calcos.ini create mode 100644 ds9/ds9.ini create mode 100644 purge_path/purge_path.ini create mode 100644 sextractor/sextractor.ini create mode 100644 stwcs/stwcs.ini diff --git a/astrolib.coords/astrolib.coords.ini b/astrolib.coords/astrolib.coords.ini new file mode 100644 index 0000000..d81edbc --- /dev/null +++ b/astrolib.coords/astrolib.coords.ini @@ -0,0 +1,41 @@ +[package] +name : astrolib.coords +version : {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git + +[about] +home : ssh://git@bitbucket.org/stsci_ssb/astrolib.coords.git +license : +summary : ${package:name} + +[source] +git_url : ${about:home}/${fn} + +[build] +number : {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} + +[requirements] +build : + d2to1 + stsci.distutils + setuptools + numpy + python +run : + numpy + python + +[test] +imports : + +commands : + + +[cbc_build] +linux : + + python setup.py install || exit 1 +windows : + + python setup.py install + if errorlevel 1 exit 1 + diff --git a/atlas/atlas-generic.ini b/atlas/atlas-generic.ini new file mode 100644 index 0000000..87377c9 --- /dev/null +++ b/atlas/atlas-generic.ini @@ -0,0 +1,56 @@ +[package] +name : atlas-generic +version : 3.10.2 + +[about] +home : http://sourceforge.net/projects/math-atlas/files/Stable +license : BSD +summary : ${package:name} + +[source] +fn : atlas${package:version}.tar.bz2 +url : ${about:home}/${package:version}/${fn} + +[build] +number : 0 + +[requirements] +build : + # +run : + # + +[test] +imports : + +commands : + + +[cbc_build] +linux : + export LIBTOOL=/usr/bin/libtool + export CC=/opt/local/bin/gcc-mp-4.8 + export F77=/opt/local/bin/gfortran-mp-4.8 + wget http://www.netlib.org/lapack/lapack-3.5.0.tgz + + mkdir -p build + pushd ./build + ../configure --prefix=$$PREFIX \ + --with-netlib-lapack-tarfile=../lapack-3.5.0.tgz \ + -C acg $$CC \ + -C if $$F77 \ + -t 2 \ + -b 64 \ + -V 128 \ + -A 12 \ + --shared + + make LIBTOOL=$$LIBTOOL + make install + + popd + +windows : + echo Not supported + if errorlevel 1 exit 1 + diff --git a/calcos/calcos.ini b/calcos/calcos.ini new file mode 100644 index 0000000..18af88d --- /dev/null +++ b/calcos/calcos.ini @@ -0,0 +1,46 @@ +[package] +name : calcos +version : {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git + +[about] +home : ssh://git@bitbucket.org/stsci_ssb/calcos.git +license : +summary : ${package:name} + +[source] +#fn : ${package:name}-${package:version}.tar.gz +#url : ${about:home}/${fn} +git_url : ${about:home} +#git_tag : + +[build] +number : {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} + +[requirements] +build : + d2to1 + numpy + pyfits + stsci.distutils + setuptools + python +run : + numpy + pyfits + python + +[test] +imports : + +commands : + + +[cbc_build] +linux : + pip install --no-deps --upgrade --force d2to1 + python setup.py install || exit 1 +windows : + + python setup.py install + if errorlevel 1 exit 1 + diff --git a/ds9/ds9.ini b/ds9/ds9.ini new file mode 100644 index 0000000..449aa04 --- /dev/null +++ b/ds9/ds9.ini @@ -0,0 +1,45 @@ +[package] +name : ds9 +version : 7.3.2 + +[about] +home : http://ds9.si.edu/download/source/ +license : GPL,LGPL,BSD +summary : ${package:name} + +[source] +fn : ${package:name}.${package:version}.tar.gz +url : ${about:home}/${fn} + +[build] +number : 0 + +[requirements] +build : + gcc >=4.6 [osx] + # +run : + # + +[test] +imports : + +commands : + + +[cbc_build] +linux : + ln -s make.darwinmavericks make.include + sed -i -e '/^ZZ/ s/$$/ -arch x86_64/' \ + -e '/^AA/ s/$$/ -arch x86_64/' make.include + + sed -i -e '/CODESIGN =/c \ + CODESIGN = echo' make.include + + make LDFLAGS='-arch x86_64 -m64' + mkdir -p $$PREFIX/bin + cp -a bin/ds9* bin/x* $$PREFIX/bin +windows : + exit 1 + if errorlevel 1 exit 1 + diff --git a/purge_path/purge_path.ini b/purge_path/purge_path.ini new file mode 100644 index 0000000..d70a17a --- /dev/null +++ b/purge_path/purge_path.ini @@ -0,0 +1,31 @@ +[package] +name: purge_path +version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git + +[about] +home: http://bitbucket.org/jhunkeler/${package:name} +license: GPL +summary: ${package:name} a small PATH manipulator + +[source] +git_url: https://bitbucket.org/jhunkeler/${package:name}.git + +[build] +number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} + +[requirements] +build: + python + setuptools +run: + python + + +[cbc_build] +linux: + python setup.py install || exit 1 + +windows: + python setup.py install + if errorlevel 1 exit 1 + diff --git a/sextractor/sextractor.ini b/sextractor/sextractor.ini new file mode 100644 index 0000000..30918e3 --- /dev/null +++ b/sextractor/sextractor.ini @@ -0,0 +1,39 @@ +[package] +name : sextractor +version : 2.19.5 + +[about] +home : http://www.astromatic.net/download/${package:name} +license : GPL +summary : ${package:name} + +[source] +fn : ${package:name}-${package:version}.tar.gz +url : ${about:home}/${fn} + +[build] +number : 0 + +[requirements] +build : + #gcc >=4.6 [darwin] + fftw + pkgconfig + +run : + fftw + #none + +[cbc_build] +linux : + ./configure --prefix=$$PREFIX \ + --with-fftw-libdir=$$PREFIX/lib \ + --with-fftw-incdir=$$PREFIX/include \ + --with-atlas-libdir='/usr/local/atlas/lib' \ + --with-atlas-incdir='/usr/local/atlas/include' + make -j $${CPU_COUNT} + make install +windows : + echo Unsupported + + diff --git a/stwcs/stwcs.ini b/stwcs/stwcs.ini new file mode 100644 index 0000000..c0ad552 --- /dev/null +++ b/stwcs/stwcs.ini @@ -0,0 +1,46 @@ +[package] +name : stwcs +version : {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git + +[about] +home : ssh://git@bitbucket.org/stsci_ssb/stwcs.git +license : +summary : ${package:name} + +[source] +#fn : ${package:name}-${package:version}.tar.gz +#url : ${about:home}/${fn} +git_url : ${about:home} +#git_tag : + +[build] +number : {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} + +[requirements] +build : + astropy + astropy-helpers + stsci.distutils + stsci.tools + setuptools + python +run : + astropy + stsci.tools + python + +[test] +imports : + +commands : + + +[cbc_build] +linux : + pip install --no-deps --upgrade --force d2to1 + python setup.py install || exit 1 +windows : + + python setup.py install + if errorlevel 1 exit 1 + -- cgit From 09424e01c0485e9df82c79df960e536f4c42c664 Mon Sep 17 00:00:00 2001 From: Joe Hunkeler Date: Tue, 25 Aug 2015 10:20:55 -0400 Subject: Fix osx dependency --- fftw/fftw.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fftw/fftw.ini b/fftw/fftw.ini index 4444ec7..fc0542d 100644 --- a/fftw/fftw.ini +++ b/fftw/fftw.ini @@ -16,7 +16,7 @@ number : 0 [requirements] build : - #none + gcc >=4.6 [osx] run : #none -- cgit From 097c70fec5c62fb22f6278aadb5dc64bfedbd051 Mon Sep 17 00:00:00 2001 From: Joe Hunkeler Date: Tue, 25 Aug 2015 10:22:19 -0400 Subject: Make iraf-runtime independent --- iraf-all/iraf.ini | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/iraf-all/iraf.ini b/iraf-all/iraf.ini index 667c26e..f59def2 100644 --- a/iraf-all/iraf.ini +++ b/iraf-all/iraf.ini @@ -87,15 +87,17 @@ linux: echo " export iraf=$$PREFIX/iraf/ + export iraf_runtime=$$PREFIX/iraf-runtime export IRAFARCH=$$IRAFARCH source \$$iraf/unix/hlib/irafuser.sh - export PATH="\$$iraf/../iraf-runtime/bin:\$$iraf/bin.\$$IRAFARCH:\$$PATH" + export PATH="\$$iraf_runtime/bin:\$$iraf/bin.\$$IRAFARCH:\$$PATH" " > $$PREFIX/etc/conda/activate.d/iraf.sh echo ' export PATH=`purge_path iraf-runtime` export PATH=`purge_path $$iraf/bin.$$IRAFARCH:$$PATH` unset iraf + unset iraf_runtime unset IRAFARCH unset IMTOOLRC unset F2C -- cgit From 334778088a95fb0c297ad8594144f8724b9a916d Mon Sep 17 00:00:00 2001 From: Joe Hunkeler Date: Tue, 25 Aug 2015 10:22:41 -0400 Subject: Fix dependent packages --- pyasdf/pyasdf.ini | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pyasdf/pyasdf.ini b/pyasdf/pyasdf.ini index d822b40..b9e7569 100644 --- a/pyasdf/pyasdf.ini +++ b/pyasdf/pyasdf.ini @@ -19,6 +19,8 @@ build: astropy pyyaml jsonschema + pytest + six [py27] setuptools python @@ -27,6 +29,7 @@ run: astropy pyyaml jsonschema + six [py27] setuptools python -- cgit From 55f9c59c25d08e3c01840b04333a58cf4485b5fe Mon Sep 17 00:00:00 2001 From: Joe Hunkeler Date: Tue, 25 Aug 2015 10:23:19 -0400 Subject: Force pkg-config usage --- pyfftw/pyfftw.ini | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pyfftw/pyfftw.ini b/pyfftw/pyfftw.ini index 97ce1d9..e9b9838 100644 --- a/pyfftw/pyfftw.ini +++ b/pyfftw/pyfftw.ini @@ -28,9 +28,12 @@ run : [cbc_build] linux : + export CFLAGS="`pkg-config --cflags fftw3`" + export LDFLAGS="`pkg-config --libs fftw3`" python setup.py install || exit 1 windows : + # You're on your own with the libraries, it seems. python setup.py install if errorlevel 1 exit 1 -- cgit From 9495cc05daa0fd8ad5fbb53cfce5f526dcae4c70 Mon Sep 17 00:00:00 2001 From: Joe Hunkeler Date: Tue, 25 Aug 2015 10:23:43 -0400 Subject: Add dependencies --- reftools/reftools.ini | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/reftools/reftools.ini b/reftools/reftools.ini index aa7c5ee..d7b1ad1 100644 --- a/reftools/reftools.ini +++ b/reftools/reftools.ini @@ -17,16 +17,26 @@ number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} build: d2to1 stsci.distutils + stsci.ndimage + stsci.imagestats stsci.tools pywcs + pysynphot + stwcs + calcos numpy setuptools python run: d2to1 stsci.distutils + stsci.ndimage + stsci.imagestats stsci.tools pywcs + pysynphot + stwcs + calcos numpy python -- cgit From 12085018614efe83b198b5019d6762834e16b30c Mon Sep 17 00:00:00 2001 From: Joe Hunkeler Date: Tue, 25 Aug 2015 11:23:27 -0400 Subject: Initial commit --- hstcal/hstcal.ini | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 hstcal/hstcal.ini diff --git a/hstcal/hstcal.ini b/hstcal/hstcal.ini new file mode 100644 index 0000000..434b1c5 --- /dev/null +++ b/hstcal/hstcal.ini @@ -0,0 +1,39 @@ +[package] +name : hstcal +version : {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git + +[about] +home : http:// +license : BSD +summary : ${package:name} + +[source] +#fn : ${package:name}-${package:version}.tar.gz +#url : ${about:home}/${fn} +git_url : ssh://git@bitbucket.org/jhunkeler/${package:name} +#git_tag : + +[build] +number : {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} + +[requirements] +build : + # +run : + # + +[test] +imports : + +commands : + + +[cbc_build] +linux : + ./configure --prefix=$$PREFIX + make + make install + +windows : + echo Not yet. + exit 1 -- cgit From 40781a00f77a768afd8e880e61e3b5656c187327 Mon Sep 17 00:00:00 2001 From: Joe Hunkeler Date: Tue, 25 Aug 2015 16:48:54 -0400 Subject: Initial commit --- sextractor/sextractor-generic.ini | 42 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 sextractor/sextractor-generic.ini diff --git a/sextractor/sextractor-generic.ini b/sextractor/sextractor-generic.ini new file mode 100644 index 0000000..b85bf8f --- /dev/null +++ b/sextractor/sextractor-generic.ini @@ -0,0 +1,42 @@ +[package] +name : sextractor-generic +version : 2.19.5 + +[about] +# Manual assignment, because package:name differs +home : http://www.astromatic.net/download/sextractor +license : GPL +summary : ${package:name} + +[source] +fn : sextractor-${package:version}.tar.gz +url : ${about:home}/${fn} + +[build] +number : 0 + +[requirements] +build : + #gcc >=4.6 [darwin] + fftw + pkgconfig + atlas-generic + +run : + fftw + atlas-generic + #none + +[cbc_build] +linux : + ./configure --prefix=$$PREFIX \ + --with-fftw-libdir=$$PREFIX/lib \ + --with-fftw-incdir=$$PREFIX/include \ + --with-atlas-libdir=$$PREFIX/lib \ + --with-atlas-incdir=$$PREFIX/include + make -j $${CPU_COUNT} + make install +windows : + echo Unsupported + + -- cgit From 2027ea8ca1eb5dbdc2aeb65eda9e7ea6747ec74f Mon Sep 17 00:00:00 2001 From: Joe Hunkeler Date: Wed, 2 Sep 2015 12:24:58 -0400 Subject: Initial commit --- calacs/calacs.ini | 46 ++++++++++++++++++++++++++ nictools/nictools.ini | 49 +++++++++++++++++++++++++++ stsci/stsci.ini | 84 +++++++++++++++++++++++++++++++++++++++++++++++ wfc3tools/wfc3tools.ini | 49 +++++++++++++++++++++++++++ wfpc2tools/wfpc2tools.ini | 79 ++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 307 insertions(+) create mode 100644 calacs/calacs.ini create mode 100644 nictools/nictools.ini create mode 100644 stsci/stsci.ini create mode 100644 wfc3tools/wfc3tools.ini create mode 100644 wfpc2tools/wfpc2tools.ini diff --git a/calacs/calacs.ini b/calacs/calacs.ini new file mode 100644 index 0000000..e8845dc --- /dev/null +++ b/calacs/calacs.ini @@ -0,0 +1,46 @@ +[package] +name : calacs +version : {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git + +[about] +home : ssh://git@bitbucket.org/stsci_ssb/${package:name}.git +license : +summary : ${package:name} + +[source] +#fn : ${package:name}-${package:version}.tar.gz +#url : ${about:home}/${fn} +git_url : ${about:home} +#git_tag : + +[build] +number : {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} + +[requirements] +build : + d2to1 + numpy + pyfits + stsci.distutils + setuptools + python +run : + numpy + pyfits + python + +[test] +imports : + +commands : + + +[cbc_build] +linux : + pip install --no-deps --upgrade --force d2to1 + python setup.py install || exit 1 +windows : + + python setup.py install + if errorlevel 1 exit 1 + diff --git a/nictools/nictools.ini b/nictools/nictools.ini new file mode 100644 index 0000000..2acb4e6 --- /dev/null +++ b/nictools/nictools.ini @@ -0,0 +1,49 @@ +[package] +name : nictools +version : {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git + +[about] +home : ssh://git@bitbucket.org/stsci_ssb/${package:name} +license : +summary : ${package:name} + +[source] +git_url : ${about:home} + +[build] +number : {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} + +[requirements] +build : + astropy + stsci.distutils + stsci.ndimage + stsci.convolve + stsci.tools + numpy + setuptools + python +run : + astropy + stsci.ndimage + stsci.convolve + stsci.tools + numpy + python + +[test] +imports : + +commands : + + +[cbc_build] +linux : + pip install --no-deps --upgrade --force d2to1 + python setup.py install || exit 1 + +windows : + python setup.py install + 2to3 -w . + if errorlevel 1 exit 1 + diff --git a/stsci/stsci.ini b/stsci/stsci.ini new file mode 100644 index 0000000..4d17ebf --- /dev/null +++ b/stsci/stsci.ini @@ -0,0 +1,84 @@ +[package] +name : stsci +version : 0.1 + +[about] +home : http://stsci.edu +license : BSD +summary : ${package:name} meta-package + +[source] +#fn : ${package:name}-${package:version}.tar.gz +#url : ${about:home}/${fn} + +[build] +number : 0 + +[requirements] +build : + ${requirements:run} +run : + #STScI + acstools + asdf-standard + astrolib.coords + astropy + astropy-helpers + calcos + cfitsio + d2to1 + drizzle [py27] + ds9 + fftw + fitsblender + hstcal + htc_utils + imexam + nictools + photutils + poppy + purge_path + pyasdf + pydrizzle + pyfftw + pyfits + #pyqtgraph #issues with building + pysynphot [py27] + pywcs + reftools [py27] + stistools + stsci.convolve + stsci.distutils + stsci.image + stsci.imagemanip + stsci.imagestats + stsci.ndimage + stsci.sphinxext + stsci.stimage + stsci.tools + stwcs + + webbpsf + wfpc2tools + wfc3tools + + + #3rd-party + atlas-generic + sextractor-generic + + #Standard + anaconda + +[test] +imports : + +commands : + + +[cbc_build] +linux : + echo "meta-package" + +windows : + echo "meta-package" diff --git a/wfc3tools/wfc3tools.ini b/wfc3tools/wfc3tools.ini new file mode 100644 index 0000000..ac16558 --- /dev/null +++ b/wfc3tools/wfc3tools.ini @@ -0,0 +1,49 @@ +[package] +name : wfc3tools +version : {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git + +[about] +home : http:// +license : BSD +summary : ${package:name} + +[source] +git_url : ssh://git@bitbucket.org/stsci_ssb/${package:name} + +[build] +number : {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} + +[requirements] +build : + d2to1 + stsci.distutils + stsci.tools + pyfits + setuptools + python +run : + stsci.tools + pyfits + python + +[test] +imports : + +commands : + + +[cbc_build] +linux : + #d2to1 hack active + pip install --no-deps --upgrade --force d2to1 || exit 1 + + python setup.py install || exit 1 + +windows : + # d2to1 hack active + pip install --no-deps --upgrade --force d2to1 + if errorlevel 1 exit 1 + + python setup.py install + if errorlevel 1 exit 1 + diff --git a/wfpc2tools/wfpc2tools.ini b/wfpc2tools/wfpc2tools.ini new file mode 100644 index 0000000..512212f --- /dev/null +++ b/wfpc2tools/wfpc2tools.ini @@ -0,0 +1,79 @@ +[package] +name : wfpc2tools +version : {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git + +[about] +home : http:// +license : BSD +summary : ${package:name} + +[source] +git_url : ssh://git@bitbucket.org/stsci_ssb/${package:name} + +[build] +number : {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} + +[requirements] +build : + d2to1 + stsci.distutils + stsci.imagestats + stsci.ndimage + stsci.tools + pyfits + setuptools + python +run : + stsci.imagestats + stsci.ndimage + stsci.tools + pyfits + python + +[test] +imports : + +commands : + + +[cbc_build] +linux : + function get_py_version() { + python --version 2>&1| awk '{sub(/-.*/,"",$$2);print $$2}' + } + export -f get_py_version + + function set_py3k() { + version=`get_py_version` + major=`echo $$version | cut -d '.' -f 1` + minor=`echo $$version | cut -d '.' -f 2` + hotfix=`echo $$version | cut -d '.' -f 3` + if (( major > 2 )); then + export PY3K=1 + else + export PY3K=0 + fi + } + export -f set_py3k + + set_py3k + + #d2to1 hack active + pip install --no-deps --upgrade --force d2to1 || exit 1 + + echo "This doesn't work. Why conda why? --python 2.7 is useless here" + if [ $$PY3K -ne 0 ] ; then + sed -i -e "s|stsci.distutils.hooks.tag_svn_revision|#removed|" setup.cfg + 2to3 -w . + fi + + python setup.py install || exit 1 + +windows : + # d2to1 hack active + pip install --no-deps --upgrade --force d2to1 + if errorlevel 1 exit 1 + + python setup.py install + if errorlevel 1 exit 1 + -- cgit From 22b5a535a44371a111389061058c0d182cfcda6b Mon Sep 17 00:00:00 2001 From: Joe Hunkeler Date: Wed, 2 Sep 2015 12:26:03 -0400 Subject: Initial commit --- drizzlepac/drizzlepac.ini | 51 +++++++++++++++++++++++++++++++++++++++++++++ fitsblender/fitsblender.ini | 46 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+) create mode 100644 drizzlepac/drizzlepac.ini create mode 100644 fitsblender/fitsblender.ini diff --git a/drizzlepac/drizzlepac.ini b/drizzlepac/drizzlepac.ini new file mode 100644 index 0000000..8a08606 --- /dev/null +++ b/drizzlepac/drizzlepac.ini @@ -0,0 +1,51 @@ +[package] +name: drizzlepac +version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git + +[about] +home: http://www.stsci.edu/institute/software_hardware/pyraf/stsci_python +license: BSD +summary: ${package:name} + +[source] +git_url: ssh://git@bitbucket.org/stsci_ssb/${package:name} + +[build] +number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} + +[requirements] +build: + astropy + astrolib.coords + fitsblender + stwcs + stsci.distutils + stsci.imagestats + stsci.stimage + nictools + python + setuptools +run: + astropy + astrolib.coords + fitsblender + stwcs + nictools + stsci.imagestats + stsci.stimage + setuptools + python + +[cbc_build] +linux: + echo This d2to1 hack is deadly. + pip install --no-deps --upgrade --force d2to1 || exit 1 + python setup.py install || exit 1 + +windows: + echo This d2to1 hack is deadly. + pip install --no-deps --upgrade --force d2to1 + if errorlevel 1 exit 1 + + python setup.py install || exit 1 + if errorlevel 1 exit 1 diff --git a/fitsblender/fitsblender.ini b/fitsblender/fitsblender.ini new file mode 100644 index 0000000..a17d6d6 --- /dev/null +++ b/fitsblender/fitsblender.ini @@ -0,0 +1,46 @@ +[package] +name : fitsblender +version : {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git + +[about] +home : http:// +license : BSD +summary : ${package:name} + +[source] +git_url : ssh://git@bitbucket.org/stsci_ssb/${package:name} + +[build] +number : {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} + +[requirements] +build : + stsci.distutils + setuptools + python + d2to1 +run : + + python + +[test] +imports : + +commands : + + +[cbc_build] +linux : + #d2to1 hack active + pip install --no-deps --upgrade --force d2to1 || exit 1 + + python setup.py install || exit 1 + +windows : + # d2to1 hack active + pip install --no-deps --upgrade --force d2to1 + if errorlevel 1 exit 1 + + python setup.py install + if errorlevel 1 exit 1 + -- cgit From 57d3cd7f5ef7a335fbb0c948951dc174feedde65 Mon Sep 17 00:00:00 2001 From: Joe Hunkeler Date: Wed, 2 Sep 2015 12:26:16 -0400 Subject: Minor changes --- astrolib.coords/astrolib.coords.ini | 3 ++- calcos/calcos.ini | 2 +- hstcal/hstcal.ini | 10 +++++----- pyasdf/pyasdf.ini | 2 +- pydrizzle/pydrizzle.ini | 29 +++++++++++++++++++++++++++++ stsci.stimage/stsci.stimage.ini | 2 +- stwcs/stwcs.ini | 32 +++++++++++++++++++++++++++++--- 7 files changed, 68 insertions(+), 12 deletions(-) diff --git a/astrolib.coords/astrolib.coords.ini b/astrolib.coords/astrolib.coords.ini index d81edbc..b46b11a 100644 --- a/astrolib.coords/astrolib.coords.ini +++ b/astrolib.coords/astrolib.coords.ini @@ -32,10 +32,11 @@ commands : [cbc_build] linux : - + pip install --no-deps --upgrade --force d2to1 || exit 1 python setup.py install || exit 1 windows : + pip install --no-deps --upgrade --force d2to1 || exit 1 python setup.py install if errorlevel 1 exit 1 diff --git a/calcos/calcos.ini b/calcos/calcos.ini index 18af88d..bf9e215 100644 --- a/calcos/calcos.ini +++ b/calcos/calcos.ini @@ -3,7 +3,7 @@ name : calcos version : {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git [about] -home : ssh://git@bitbucket.org/stsci_ssb/calcos.git +home : ssh://git@bitbucket.org/stsci_ssb/${package:name}.git license : summary : ${package:name} diff --git a/hstcal/hstcal.ini b/hstcal/hstcal.ini index 434b1c5..a6d1232 100644 --- a/hstcal/hstcal.ini +++ b/hstcal/hstcal.ini @@ -3,14 +3,14 @@ name : hstcal version : {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git [about] -home : http:// +home : ssh://git@bitbucket.org/stsci_ssb/${package:name}.git license : BSD summary : ${package:name} [source] #fn : ${package:name}-${package:version}.tar.gz #url : ${about:home}/${fn} -git_url : ssh://git@bitbucket.org/jhunkeler/${package:name} +git_url : ${about:home} #git_tag : [build] @@ -18,7 +18,7 @@ number : {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} [requirements] build : - # + gcc >=4.6 [osx] run : # @@ -30,9 +30,9 @@ commands : [cbc_build] linux : - ./configure --prefix=$$PREFIX + ./configure --destdir=$$PREFIX make - make install + ./waf install windows : echo Not yet. diff --git a/pyasdf/pyasdf.ini b/pyasdf/pyasdf.ini index b9e7569..446ffb9 100644 --- a/pyasdf/pyasdf.ini +++ b/pyasdf/pyasdf.ini @@ -20,7 +20,7 @@ build: pyyaml jsonschema pytest - six [py27] + six setuptools python diff --git a/pydrizzle/pydrizzle.ini b/pydrizzle/pydrizzle.ini index 9d4c102..46cd116 100644 --- a/pydrizzle/pydrizzle.ini +++ b/pydrizzle/pydrizzle.ini @@ -21,6 +21,8 @@ build: astropy >=1.0 numpy >=1.6.0 stsci.distutils + stsci.tools + pyfits setuptools python @@ -29,12 +31,39 @@ run: astropy-helpers astropy >=1.0 numpy >=1.6.0 + stsci.tools + pyfits python [cbc_build] linux: + function get_py_version() { + python --version 2>&1| awk '{sub(/-.*/,"",$$2);print $$2}' + } + export -f get_py_version + + function set_py3k() { + version=`get_py_version` + major=`echo $$version | cut -d '.' -f 1` + minor=`echo $$version | cut -d '.' -f 2` + hotfix=`echo $$version | cut -d '.' -f 3` + if (( major > 2 )); then + export PY3K=1 + else + export PY3K=0 + fi + } + export -f set_py3k + + set_py3k + + if [ $$PY3K -ne 0 ]; then + sed -i -e "s|stsci.distutils.hooks.tag_svn_revision|#removed|" setup.cfg + fi + echo This d2to1 hack is deadly. pip install --no-deps --upgrade --force d2to1 || exit 1 + python setup.py install || exit 1 windows: diff --git a/stsci.stimage/stsci.stimage.ini b/stsci.stimage/stsci.stimage.ini index 4b233e9..f73a22c 100644 --- a/stsci.stimage/stsci.stimage.ini +++ b/stsci.stimage/stsci.stimage.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: yes +preserve_egg_dir: yes [requirements] build: diff --git a/stwcs/stwcs.ini b/stwcs/stwcs.ini index c0ad552..a217b43 100644 --- a/stwcs/stwcs.ini +++ b/stwcs/stwcs.ini @@ -3,8 +3,8 @@ name : stwcs version : {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git [about] -home : ssh://git@bitbucket.org/stsci_ssb/stwcs.git -license : +home : ssh://git@bitbucket.org/stsci_ssb/${package:name} +license : BSD summary : ${package:name} [source] @@ -37,10 +37,36 @@ commands : [cbc_build] linux : + function get_py_version() { + python --version 2>&1| awk '{sub(/-.*/,"",$$2);print $$2}' + } + export -f get_py_version + + function set_py3k() { + version=`get_py_version` + major=`echo $$version | cut -d '.' -f 1` + minor=`echo $$version | cut -d '.' -f 2` + hotfix=`echo $$version | cut -d '.' -f 3` + if (( major > 2 )); then + export PY3K=1 + else + export PY3K=0 + fi + } + export -f set_py3k + + set_py3k + + pip install --no-deps --upgrade --force d2to1 + if [ $$PY3K -ne 0 ] ; then + sed -i -e "s|stsci.distutils.hooks.tag_svn_revision|#removed|" setup.cfg + 2to3 -w . + fi python setup.py install || exit 1 + windows : - python setup.py install + 2to3 -w . if errorlevel 1 exit 1 -- cgit From d8713776ec60ac47e73691ba71f3d3d3580b298c Mon Sep 17 00:00:00 2001 From: Joe Hunkeler Date: Wed, 2 Sep 2015 22:24:08 -0400 Subject: Recommit --- stsci/stsci.ini | 84 ---------------------------------------------- stsci/stsci_np19py27.ini | 86 ++++++++++++++++++++++++++++++++++++++++++++++++ stsci/stsci_np19py34.ini | 86 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 172 insertions(+), 84 deletions(-) delete mode 100644 stsci/stsci.ini create mode 100644 stsci/stsci_np19py27.ini create mode 100644 stsci/stsci_np19py34.ini diff --git a/stsci/stsci.ini b/stsci/stsci.ini deleted file mode 100644 index 4d17ebf..0000000 --- a/stsci/stsci.ini +++ /dev/null @@ -1,84 +0,0 @@ -[package] -name : stsci -version : 0.1 - -[about] -home : http://stsci.edu -license : BSD -summary : ${package:name} meta-package - -[source] -#fn : ${package:name}-${package:version}.tar.gz -#url : ${about:home}/${fn} - -[build] -number : 0 - -[requirements] -build : - ${requirements:run} -run : - #STScI - acstools - asdf-standard - astrolib.coords - astropy - astropy-helpers - calcos - cfitsio - d2to1 - drizzle [py27] - ds9 - fftw - fitsblender - hstcal - htc_utils - imexam - nictools - photutils - poppy - purge_path - pyasdf - pydrizzle - pyfftw - pyfits - #pyqtgraph #issues with building - pysynphot [py27] - pywcs - reftools [py27] - stistools - stsci.convolve - stsci.distutils - stsci.image - stsci.imagemanip - stsci.imagestats - stsci.ndimage - stsci.sphinxext - stsci.stimage - stsci.tools - stwcs - - webbpsf - wfpc2tools - wfc3tools - - - #3rd-party - atlas-generic - sextractor-generic - - #Standard - anaconda - -[test] -imports : - -commands : - - -[cbc_build] -linux : - echo "meta-package" - -windows : - echo "meta-package" diff --git a/stsci/stsci_np19py27.ini b/stsci/stsci_np19py27.ini new file mode 100644 index 0000000..20cfb1c --- /dev/null +++ b/stsci/stsci_np19py27.ini @@ -0,0 +1,86 @@ +[package] +name : stsci +version : 0.1 + +[about] +home : http://stsci.edu +license : BSD +summary : ${package:name} meta-package + +[source] +#fn : ${package:name}-${package:version}.tar.gz +#url : ${about:home}/${fn} + +[build] +number : 0 + +[requirements] +build : + #${requirements:run} +run : + #STScI + acstools + asdf-standard + astrolib.coords + astropy + astropy-helpers + calcos + cfitsio + d2to1 + drizzle [py27] + ds9 + fftw + fitsblender + hstcal + htc_utils + imexam + nictools + photutils + poppy + purge_path + pyasdf + pydrizzle + pyfftw + pyfits + #pyqtgraph #issues with building + pysynphot [py27] + pywcs + reftools [py27] + stistools + stsci.convolve + stsci.distutils + stsci.image + stsci.imagemanip + stsci.imagestats + stsci.ndimage + stsci.sphinxext + stsci.stimage + stsci.tools + stwcs + + webbpsf + wfpc2tools + wfc3tools + + + #3rd-party + atlas-generic + sextractor-generic + + #Standard + anaconda + python ==2.7 + numpy ==1.9 + +[test] +imports : + +commands : + + +[cbc_build] +linux : + echo "meta-package" + +windows : + echo "meta-package" diff --git a/stsci/stsci_np19py34.ini b/stsci/stsci_np19py34.ini new file mode 100644 index 0000000..a097797 --- /dev/null +++ b/stsci/stsci_np19py34.ini @@ -0,0 +1,86 @@ +[package] +name : stsci +version : 0.1 + +[about] +home : http://stsci.edu +license : BSD +summary : ${package:name} meta-package + +[source] +#fn : ${package:name}-${package:version}.tar.gz +#url : ${about:home}/${fn} + +[build] +number : 0 + +[requirements] +build : + #${requirements:run} +run : + #STScI + acstools + asdf-standard + astrolib.coords + astropy + astropy-helpers + calcos + cfitsio + d2to1 + drizzle [py27] + ds9 + fftw + fitsblender + hstcal + htc_utils + imexam + nictools + photutils + poppy + purge_path + pyasdf + pydrizzle + pyfftw + pyfits + #pyqtgraph #issues with building + pysynphot [py27] + pywcs + reftools [py27] + stistools + stsci.convolve + stsci.distutils + stsci.image + stsci.imagemanip + stsci.imagestats + stsci.ndimage + stsci.sphinxext + stsci.stimage + stsci.tools + stwcs + + webbpsf + wfpc2tools + wfc3tools + + + #3rd-party + atlas-generic + sextractor-generic + + #Standard + anaconda + python ==3.4 + numpy ==1.9 + +[test] +imports : + +commands : + + +[cbc_build] +linux : + echo "meta-package" + +windows : + echo "meta-package" -- cgit From 37d1f8b955569bf6ddf2e8cd1a4405064540feac Mon Sep 17 00:00:00 2001 From: Joe Hunkeler Date: Thu, 3 Sep 2015 14:53:29 -0400 Subject: Going back to basics. --- stsci/stsci.ini | 126 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 126 insertions(+) create mode 100644 stsci/stsci.ini diff --git a/stsci/stsci.ini b/stsci/stsci.ini new file mode 100644 index 0000000..484d9d2 --- /dev/null +++ b/stsci/stsci.ini @@ -0,0 +1,126 @@ +[package] +name : stsci +version : 1.5 + +[about] +home : http://stsci.edu +license : BSD +summary : ${package:name} meta-package + +[source] +#fn : ${package:name}-${package:version}.tar.gz +#url : ${about:home}/${fn} + +[build] +number : 0 + +[requirements] +build : + ${requirements:run} +run : + #STScI + acstools [py34] + acstools [py27] + asdf-standard [py34] + asdf-standard [py27] + astrolib.coords [py34] + astrolib.coords [py27] + astropy [py34] + astropy [py27] + astropy-helpers [py34] + astropy-helpers [py27] + calcos [py34] + calcos [py27] + cfitsio + d2to1 [py34] + d2to1 [py27] + #drizzle [py34] + drizzle [py27] + ds9 + fftw + fitsblender [py34] + fitsblender [py27] + hstcal [py34] + hstcal [py27] + htc_utils [py34] + htc_utils [py27] + imexam [py34] + imexam [py27] + nictools [py34] + nictools [py27] + photutils [py34] + photutils [py27] + poppy [py34] + poppy [py27] + purge_path [py34] + purge_path [py27] + pyasdf [py34] + pyasdf [py27] + pydrizzle [py34] + pydrizzle [py27] + pyfftw [py34] + pyfftw [py27] + pyfits [py34] + pyfits [py27] + #pyqtgraph #issues with building + #pysynphot [py34] + pysynphot [py27] + pywcs [py34] + pywcs [py27] + #reftools [py34] + reftools [py27] + stistools [py34] + stistools [py27] + stsci.convolve [py34] + stsci.convolve [py27] + stsci.distutils [py34] + stsci.distutils [py27] + stsci.image [py34] + stsci.image [py27] + stsci.imagemanip [py34] + stsci.imagemanip [py27] + stsci.imagestats [py34] + stsci.imagestats [py27] + stsci.ndimage [py34] + stsci.ndimage [py27] + stsci.sphinxext [py34] + stsci.sphinxext [py27] + stsci.stimage [py34] + stsci.stimage [py27] + stsci.tools [py34] + stsci.tools [py27] + stwcs [py34] + stwcs [py27] + + webbpsf [py34] + webbpsf [py27] + wfpc2tools [py34] + wfpc2tools [py27] + wfc3tools [py34] + wfc3tools [py27] + + + #3rd-party + atlas-generic + sextractor-generic + + #Standard + anaconda [py34] + anaconda [py27] + numpy [py34] + numpy [py27] + python [py34] + python [py27] + +[test] +imports : + +commands : + + +[cbc_build] +linux : + echo "meta-package" + +windows : + echo "meta-package" -- cgit From 3fe42509e8318a136bc1dd1c7ea42a7bd86bc233 Mon Sep 17 00:00:00 2001 From: Joe Hunkeler Date: Thu, 3 Sep 2015 14:54:24 -0400 Subject: Fix tab --- stsci/stsci.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/stsci/stsci.ini b/stsci/stsci.ini index 484d9d2..4ef1958 100644 --- a/stsci/stsci.ini +++ b/stsci/stsci.ini @@ -18,9 +18,9 @@ number : 0 build : ${requirements:run} run : - #STScI - acstools [py34] - acstools [py27] + #STScI + acstools [py34] + acstools [py27] asdf-standard [py34] asdf-standard [py27] astrolib.coords [py34] -- cgit From f82e504be3c6d1375aa3ed0cadf4b0d33649083e Mon Sep 17 00:00:00 2001 From: Joe Hunkeler Date: Thu, 3 Sep 2015 14:56:41 -0400 Subject: Initial commit --- jwst_lib/jwst_lib.ini | 77 ++++++++++++++++++++++++++++++++++++++++++++++++ webbpsf-data/webbpsf.ini | 41 ++++++++++++++++++++++++++ 2 files changed, 118 insertions(+) create mode 100644 jwst_lib/jwst_lib.ini create mode 100644 webbpsf-data/webbpsf.ini diff --git a/jwst_lib/jwst_lib.ini b/jwst_lib/jwst_lib.ini new file mode 100644 index 0000000..fa682f2 --- /dev/null +++ b/jwst_lib/jwst_lib.ini @@ -0,0 +1,77 @@ +[package] +name : jwst_lib +version : {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git + +[about] +home : ssh://git@bitbucket.org/stsci_ssb/${package:name} +license : BSD +summary : ${package:name} + +[source] +#fn : ${package:name}-${package:version}.tar.gz +#url : ${about:home}/${fn} +git_url : ${about:home} +#git_tag : + +[build] +number : {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} +preserve_egg_dir: True + +[requirements] +build : + d2to1 + astropy + stsci.distutils + numpy + setuptools + python +run : + astropy + stsci.distutils + numpy + python + +[test] +imports : + +commands : + + +[cbc_build] +linux : + function get_py_version() { + python --version 2>&1| awk '{sub(/-.*/,"",$$2);print $$2}' + } + export -f get_py_version + + function set_py3k() { + version=`get_py_version` + major=`echo $$version | cut -d '.' -f 1` + minor=`echo $$version | cut -d '.' -f 2` + hotfix=`echo $$version | cut -d '.' -f 3` + if (( major > 2 )); then + export PY3K=1 + else + export PY3K=0 + fi + } + export -f set_py3k + + set_py3k + + + pip install --no-deps --force --upgrade d2to1 + for d in * + do + if [ $$PY3K -ne 0 ] ; then + ( cd $$d && 2to3 -w . ) + fi + ( cd $$d && python setup.py install || exit 1 ) + done + +windows : + echo "Unsupported (yet?)" + #python setup.py install + #2to3 -w . + #if errorlevel 1 exit 1 + diff --git a/webbpsf-data/webbpsf.ini b/webbpsf-data/webbpsf.ini new file mode 100644 index 0000000..e830c7b --- /dev/null +++ b/webbpsf-data/webbpsf.ini @@ -0,0 +1,41 @@ +[package] +name: webbpsf-data +version: 0.3.3 + +[about] +home: http://www.stsci.edu/~mperrin/software/webbpsf +license: BSD +summary: ${package:name} data files + +[source] +fn: ${package:name}-${package:version}.tar.gz +url: ${about:home}/${fn} + +[build] +number: 0 + +[requirements] +build: + #none + +run: + webbpsf + +[cbc_build] +linux: + mkdir -p $$PREFIX/share + mkdir -p $$PREFIX/etc/conda/activate.d + mkdir -p $$PREFIX/etc/conda/deactivate.d + cp -a `pwd` $$PREFIX/share/${package:name} + + echo " + export WEBBPSF_PATH=$$PREFIX/share/${package:name} + " > $$PREFIX/etc/conda/activate.d/${package:name}.sh + + echo " + unset WEBBPSF_PATH + " > $$PREFIX/etc/conda/deactivate.d/${package:name}.sh + +windows: + echo "Not supported (yet?)" + exit 1 -- cgit From 3f457ae0449d01cdd4e52ffdc8276e223dd49b96 Mon Sep 17 00:00:00 2001 From: Joe Hunkeler Date: Thu, 3 Sep 2015 14:57:11 -0400 Subject: Remove version constraint --- imexam/imexam.ini | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/imexam/imexam.ini b/imexam/imexam.ini index 267e2c6..683a86b 100644 --- a/imexam/imexam.ini +++ b/imexam/imexam.ini @@ -21,8 +21,8 @@ build: d2to1 nose astropy-helpers - astropy >=1.0 - numpy >=1.6.0 + astropy + numpy scipy cython matplotlib @@ -35,8 +35,8 @@ run: d2to1 nose astropy-helpers - astropy >=1.0 - numpy >=1.6.0 + astropy + numpy scipy cython matplotlib -- cgit From c1b93888225afc06b73209846d0bdc05a6352433 Mon Sep 17 00:00:00 2001 From: Joe Hunkeler Date: Thu, 3 Sep 2015 14:58:18 -0400 Subject: Fix pkg_resources misinterpretation. Credit: Joseph Long --- pyfits/pyfits.ini | 1 + webbpsf/webbpsf.ini | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pyfits/pyfits.ini b/pyfits/pyfits.ini index 7a0d571..fac2058 100644 --- a/pyfits/pyfits.ini +++ b/pyfits/pyfits.ini @@ -15,6 +15,7 @@ patches: [build] number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} +preserve_egg_dir: True [requirements] build: diff --git a/webbpsf/webbpsf.ini b/webbpsf/webbpsf.ini index c6992c4..2d3a839 100644 --- a/webbpsf/webbpsf.ini +++ b/webbpsf/webbpsf.ini @@ -8,13 +8,11 @@ license: BSD summary: ${package:name} [source] -#fn: ${package:name}-${package:version}.tar.gz -#url: ${cbc_cgi:url}/${fn} git_url: ${about:home} -#git_tag: [build] number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} +preserve_egg_dir: True [requirements] build: @@ -37,6 +35,7 @@ run: matplotlib poppy six [py27] + webbpsf-data setuptools python -- cgit From 4314286891e371254f1983cfbad57e15346ba355 Mon Sep 17 00:00:00 2001 From: Joe Hunkeler Date: Thu, 3 Sep 2015 14:59:33 -0400 Subject: Remove bad metapackages --- stsci/stsci_np19py27.ini | 86 ------------------------------------------------ stsci/stsci_np19py34.ini | 86 ------------------------------------------------ 2 files changed, 172 deletions(-) delete mode 100644 stsci/stsci_np19py27.ini delete mode 100644 stsci/stsci_np19py34.ini diff --git a/stsci/stsci_np19py27.ini b/stsci/stsci_np19py27.ini deleted file mode 100644 index 20cfb1c..0000000 --- a/stsci/stsci_np19py27.ini +++ /dev/null @@ -1,86 +0,0 @@ -[package] -name : stsci -version : 0.1 - -[about] -home : http://stsci.edu -license : BSD -summary : ${package:name} meta-package - -[source] -#fn : ${package:name}-${package:version}.tar.gz -#url : ${about:home}/${fn} - -[build] -number : 0 - -[requirements] -build : - #${requirements:run} -run : - #STScI - acstools - asdf-standard - astrolib.coords - astropy - astropy-helpers - calcos - cfitsio - d2to1 - drizzle [py27] - ds9 - fftw - fitsblender - hstcal - htc_utils - imexam - nictools - photutils - poppy - purge_path - pyasdf - pydrizzle - pyfftw - pyfits - #pyqtgraph #issues with building - pysynphot [py27] - pywcs - reftools [py27] - stistools - stsci.convolve - stsci.distutils - stsci.image - stsci.imagemanip - stsci.imagestats - stsci.ndimage - stsci.sphinxext - stsci.stimage - stsci.tools - stwcs - - webbpsf - wfpc2tools - wfc3tools - - - #3rd-party - atlas-generic - sextractor-generic - - #Standard - anaconda - python ==2.7 - numpy ==1.9 - -[test] -imports : - -commands : - - -[cbc_build] -linux : - echo "meta-package" - -windows : - echo "meta-package" diff --git a/stsci/stsci_np19py34.ini b/stsci/stsci_np19py34.ini deleted file mode 100644 index a097797..0000000 --- a/stsci/stsci_np19py34.ini +++ /dev/null @@ -1,86 +0,0 @@ -[package] -name : stsci -version : 0.1 - -[about] -home : http://stsci.edu -license : BSD -summary : ${package:name} meta-package - -[source] -#fn : ${package:name}-${package:version}.tar.gz -#url : ${about:home}/${fn} - -[build] -number : 0 - -[requirements] -build : - #${requirements:run} -run : - #STScI - acstools - asdf-standard - astrolib.coords - astropy - astropy-helpers - calcos - cfitsio - d2to1 - drizzle [py27] - ds9 - fftw - fitsblender - hstcal - htc_utils - imexam - nictools - photutils - poppy - purge_path - pyasdf - pydrizzle - pyfftw - pyfits - #pyqtgraph #issues with building - pysynphot [py27] - pywcs - reftools [py27] - stistools - stsci.convolve - stsci.distutils - stsci.image - stsci.imagemanip - stsci.imagestats - stsci.ndimage - stsci.sphinxext - stsci.stimage - stsci.tools - stwcs - - webbpsf - wfpc2tools - wfc3tools - - - #3rd-party - atlas-generic - sextractor-generic - - #Standard - anaconda - python ==3.4 - numpy ==1.9 - -[test] -imports : - -commands : - - -[cbc_build] -linux : - echo "meta-package" - -windows : - echo "meta-package" -- cgit From f9eee35d0315930db0811308adaa728809a6b7a2 Mon Sep 17 00:00:00 2001 From: Joe Hunkeler Date: Thu, 17 Sep 2015 17:41:17 -0400 Subject: Return to external git repo usage --- iraf-all/iraf.ini | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/iraf-all/iraf.ini b/iraf-all/iraf.ini index f59def2..b90e926 100644 --- a/iraf-all/iraf.ini +++ b/iraf-all/iraf.ini @@ -11,8 +11,7 @@ summary: NOAO Image Reduction and Analysis Facility # Remember, always 32-bit! Now feast upon my tears. #fn: ${package:name}.lnux.x86.fixup.tar.gz #url: ${cbc_cgi:url}/${fn} -#git_url: ssh://git@bitbucket.org/jhunkeler/${package:name}-all -git_url: file:///users/shared/${package:name}-metal +git_url: ssh://git@bitbucket.org/jhunkeler/${package:name}-combined [build] -- cgit From 31ce665a4b073e09516e3d7b757d7872f4a6ecc0 Mon Sep 17 00:00:00 2001 From: Joe Hunkeler Date: Fri, 25 Sep 2015 12:04:23 -0400 Subject: Initial commit --- stsci.sphere/stsci.sphere.ini | 45 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 stsci.sphere/stsci.sphere.ini diff --git a/stsci.sphere/stsci.sphere.ini b/stsci.sphere/stsci.sphere.ini new file mode 100644 index 0000000..9a006c6 --- /dev/null +++ b/stsci.sphere/stsci.sphere.ini @@ -0,0 +1,45 @@ +[package] +name: stsci.sphere +version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git + +[about] +home: http://www.stsci.edu/institute/software_hardware +license: GPL +summary: ${package:name} + +[source] +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 + +[requirements] +build: + d2to1 + setuptools + stsci.distutils + numpy + python + +run: + d2to1 + #pyfits + numpy + python + + +[cbc_build] +linux: + echo This d2to1 hack is deadly. + pip install --no-deps --upgrade --force d2to1 || exit 1 + python setup.py install || exit 1 + +windows: + echo This d2to1 hack is deadly. + pip install --no-deps --upgrade --force d2to1 + if errorlevel 1 exit 1 + + python setup.py install + if errorlevel 1 exit 1 -- cgit From 8c6fc06f4ede99b55217b7ae538007d1e1fbb894 Mon Sep 17 00:00:00 2001 From: Joe Hunkeler Date: Fri, 25 Sep 2015 12:34:41 -0400 Subject: Initial commit --- costools/costools.ini | 44 +++++++++++++++++++++++++++ stsci.skypac/stsci.skypac.ini | 70 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 114 insertions(+) create mode 100644 costools/costools.ini create mode 100644 stsci.skypac/stsci.skypac.ini diff --git a/costools/costools.ini b/costools/costools.ini new file mode 100644 index 0000000..44fd79a --- /dev/null +++ b/costools/costools.ini @@ -0,0 +1,44 @@ +[package] +name: costools +version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git + +[about] +home: http://www.stsci.edu/institute/software_hardware +license: BSD +summary: ${package:name} + +[source] +git_url: ssh://git@bitbucket.org/stsci_ssb/${package:name} + +[build] +number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} + +[requirements] +build: + d2to1 + stsci.distutils + astropy + calcos + stsci.tools + pyfits + python + setuptools +run: + astropy + stsci.tools + setuptools + python + +[cbc_build] +linux: + echo This d2to1 hack is deadly. + pip install --no-deps --upgrade --force d2to1 || exit 1 + python setup.py install || exit 1 + +windows: + echo This d2to1 hack is deadly. + pip install --no-deps --upgrade --force d2to1 + if errorlevel 1 exit 1 + + python setup.py install || exit 1 + if errorlevel 1 exit 1 diff --git a/stsci.skypac/stsci.skypac.ini b/stsci.skypac/stsci.skypac.ini new file mode 100644 index 0000000..f52c5a9 --- /dev/null +++ b/stsci.skypac/stsci.skypac.ini @@ -0,0 +1,70 @@ +[package] +name : stsci.skypac +version : {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git + +[about] +home : ssh://git@bitbucket.org/stsci_ssb/${package:name} +license : BSD +summary : ${package:name} + +[source] +#fn : ${package:name}-${package:version}.tar.gz +#url : ${about:home}/${fn} +git_url : ${about:home} +#git_tag : + +[build] +number : {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} +preserve_egg_dir: yes + +[requirements] +build : + stsci.distutils + stsci.sphere + setuptools + python +run : + stsci.sphere + python + +[test] +imports : + +commands : + + +[cbc_build] +linux : + function get_py_version() { + python --version 2>&1| awk '{sub(/-.*/,"",$$2);print $$2}' + } + export -f get_py_version + + function set_py3k() { + version=`get_py_version` + major=`echo $$version | cut -d '.' -f 1` + minor=`echo $$version | cut -d '.' -f 2` + hotfix=`echo $$version | cut -d '.' -f 3` + if (( major > 2 )); then + export PY3K=1 + else + export PY3K=0 + fi + } + export -f set_py3k + + set_py3k + + + pip install --no-deps --upgrade --force d2to1 + if [ $$PY3K -ne 0 ] ; then + sed -i -e "s|stsci.distutils.hooks.tag_svn_revision|#removed|" setup.cfg + 2to3 -w . + fi + python setup.py install || exit 1 + +windows : + python setup.py install + 2to3 -w . + if errorlevel 1 exit 1 + -- cgit From c5f46e374e9c361a6bb3191da3939a189fbe7afd Mon Sep 17 00:00:00 2001 From: Joe Hunkeler Date: Fri, 25 Sep 2015 15:26:41 -0400 Subject: Initial commit --- stsci-hst/stsci-hst.ini | 101 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) create mode 100644 stsci-hst/stsci-hst.ini diff --git a/stsci-hst/stsci-hst.ini b/stsci-hst/stsci-hst.ini new file mode 100644 index 0000000..f2a5183 --- /dev/null +++ b/stsci-hst/stsci-hst.ini @@ -0,0 +1,101 @@ +[package] +name : stsci-hst +version : 1.0 + +[about] +home : http://www.stsci.edu +license : BSD +summary : ${package:name} meta-package + +[source] +#fn : ${package:name}-${package:version}.tar.gz +#url : ${about:home}/${fn} + +[build] +number : 0 + +[requirements] +build : + ${requirements:run} +run : + # Extra + purge_path [py34] + purge_path [py27] + # HST + acstools [py34] + acstools [py27] + astrolib.coords [py34] + astrolib.coords [py27] + # pyfits MUST come before astropy... dependency nightmare + pyfits [py34] + pyfits [py27] + # astropy MUST come after pyfits... see also pyfits + astropy [py34] + astropy [py27] + calcos [py34] + calcos [py27] + costools [py34] + costools [py27] + d2to1 [py34] + d2to1 [py27] + fitsblender [py34] + fitsblender [py27] + hstcal [py34] + hstcal [py27] + nictools [py34] + nictools [py27] + pysynphot [py34] + pysynphot [py27] + pywcs [py34] + pywcs [py27] + reftools [py34] + reftools [py27] + stistools [py34] + stistools [py27] + stsci.convolve [py34] + stsci.convolve [py27] + stsci.distutils [py34] + stsci.distutils [py27] + stsci.image [py34] + stsci.image [py27] + stsci.imagemanip [py34] + stsci.imagemanip [py27] + stsci.imagestats [py34] + stsci.imagestats [py27] + stsci.ndimage [py34] + stsci.ndimage [py27] + stsci.sphinxext [py34] + stsci.sphinxext [py27] + stsci.stimage [py34] + stsci.stimage [py27] + stsci.skypac [py34] + stsci.skypac [py27] + stsci.tools [py34] + stsci.tools [py27] + stwcs [py34] + stwcs [py27] + wfpc2tools [py34] + wfpc2tools [py27] + wfc3tools [py34] + wfc3tools [py27] + + #Standard + anaconda [py34] + anaconda [py27] + numpy [py34] + numpy [py27] + python [py34] + python [py27] + +[test] +imports : + +commands : + + +[cbc_build] +linux : + echo "meta-package" + +windows : + echo "meta-package" -- cgit From 4b00c5abebcd321fd95755c4816d2fd6790a172b Mon Sep 17 00:00:00 2001 From: Joe Hunkeler Date: Fri, 25 Sep 2015 15:26:53 -0400 Subject: Corrected for building under python 3.4 --- pysynphot/pysynphot.ini | 7 ++++--- reftools/reftools.ini | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pysynphot/pysynphot.ini b/pysynphot/pysynphot.ini index ad0b999..904ac5f 100644 --- a/pysynphot/pysynphot.ini +++ b/pysynphot/pysynphot.ini @@ -9,9 +9,11 @@ summary: ${package:name} [source] git_url: ${about:home} -git_tag: +#git_tag: + [build] number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} +preserve_egg_dir: yes [requirements] build: @@ -37,13 +39,12 @@ run: pyfits numpy matplotlib - setuptools python [cbc_build] linux: echo This d2to1 hack is deadly. - #pip install --no-deps --upgrade --force d2to1 || exit 1 + pip install --no-deps --upgrade --force d2to1 || exit 1 python setup.py install || exit 1 windows: diff --git a/reftools/reftools.ini b/reftools/reftools.ini index d7b1ad1..0b3ef60 100644 --- a/reftools/reftools.ini +++ b/reftools/reftools.ini @@ -12,6 +12,7 @@ git_url: ssh://git@bitbucket.org/stsci_ssb/${package:name}.git [build] number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} +preserve_egg_dir: yes [requirements] build: -- cgit