Update all packages to use astropy v1.1

7 files changed, 48 insertions, 341 deletions

diff --git a/deprecated/astropy-helpers/astropy-helpers.ini b/deprecated/astropy-helpers/astropy-helpers.ini
deleted file mode 100644
index 31e01b1..0000000
--- a/deprecated/astropy-helpers/astropy-helpers.ini
+++ /dev/null
@@ -1,36 +0,0 @@
-[package]
-name: astropy-helpers
-version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
-
-[about]
-home: https://github.com/astropy/${package:name}
-license: BSD
-summary: ${package:name}
-readme: README.rst
-
-[source]
-#fn: ${package:name}-${package:version}.tar.gz
-#url: ${cbc_cgi:url}/${fn}
-git_url: ${about:home}
-
-[build]
-number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
-
-[requirements]
-build:
-    python
-    setuptools
-    numpy
-run:
-    python
-    numpy
-
-
-[cbc_build]
-linux:
-    python setup.py install || exit 1
-
-
-windows:
-    python setup.py install
-    if errorlevel 1 exit 1
diff --git a/deprecated/astropy/astropy.ini b/deprecated/astropy/astropy.ini
deleted file mode 100644
index 83eebb0..0000000
--- a/deprecated/astropy/astropy.ini
+++ /dev/null
@@ -1,42 +0,0 @@
-[package]
-name: astropy
-version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git
-
-[about]
-home: https://github.com/astropy/${package:name}
-license: BSD
-summary: ${package:name}
-readme: README.rst
-
-[source]
-#fn: ${package:name}-${package:version}.tar.gz
-#url: ${cbc_cgi:url}/${fn}
-git_url: ${about:home}
-
-[build]
-number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
-
-[requirements]
-build:
-    jinja2
-    astropy-helpers
-    cython
-    setuptools
-    numpy
-    python
-
-run:
-    jinja2
-    cython
-    astropy-helpers
-    numpy
-    python
-
-
-[cbc_build]
-linux:
-    python setup.py install --offline || exit 1
-
-windows:
-    python setup.py install --offline
-    if errorlevel 1 exit 1
diff --git a/deprecated/calacs/calacs.ini b/deprecated/calacs/calacs.ini
deleted file mode 100644
index 4a1737b..0000000
--- a/deprecated/calacs/calacs.ini
+++ /dev/null
@@ -1,46 +0,0 @@
-[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
-    astropy
-    stsci.distutils
-    setuptools
-	python
-run : 
-    numpy
-    astropy
-	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/deprecated/iraf-src/iraf.ini b/deprecated/iraf-src/iraf.ini
deleted file mode 100644
index 7a14ccb..0000000
--- a/deprecated/iraf-src/iraf.ini
+++ /dev/null
@@ -1,116 +0,0 @@
-[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
-
-    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 "*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/include -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/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
-
-    ( 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
-
diff --git a/deprecated/iraf-stsci/iraf.ini b/deprecated/iraf-stsci/iraf.ini
deleted file mode 100644
index 2ca77b5..0000000
--- a/deprecated/iraf-stsci/iraf.ini
+++ /dev/null
@@ -1,53 +0,0 @@
-[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
diff --git a/deprecated/iraf/iraf.ini b/deprecated/iraf/iraf.ini
deleted file mode 100644
index 0d6f77e..0000000
--- a/deprecated/iraf/iraf.ini
+++ /dev/null
@@ -1,48 +0,0 @@
-[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: https://bitbucket.org/jhunkeler/${package:name}
-
-# 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
-    FAKEHOME=$$PREFIX/iraf/fakehome
-    cp -a `pwd` $$PREFIX/iraf
-    cd $$PREFIX/iraf
-    ./install \
-        --accept-defaults \
-        --fakehome $$FAKEHOME \
-        --term xterm \
-        --mach linux \
-        --bindir $$FAKEHOME/bin \
-        --cache $$FAKEHOME/cache \
-        --imdir $$FAKEHOME/imdir
-    rm -f bin
-    ln -s bin.linux bin
-    ln -s bin.linux bin.linux64
-
-windows:
-    echo Not supported on Windows
diff --git a/deprecated/pyfits/pyfits-cfitsio.patch b/deprecated/pyfits/pyfits-cfitsio.patch
new file mode 100644
index 0000000..64e7057
--- /dev/null
+++ b/deprecated/pyfits/pyfits-cfitsio.patch
@@ -0,0 +1,48 @@
+diff -u -p --recursive a/pyfits-3.3/setup.py b/pyfits-3.3/setup.py
+--- setup.py	2014-06-09 16:07:11.000000000 -0400
++++ setup.py	2015-07-05 20:46:43.071332734 -0400
+@@ -1,15 +1,41 @@
+ #!/usr/bin/env python
+ 
+ try:
+-    from setuptools import setup
++    from setuptools import setup, Extension
+ except ImportError:
+     from ez_setup import use_setuptools
+     use_setuptools()
+-    from setuptools import setup
++    from setuptools import setup, Extension
+ 
++import sys
++import subprocess
++
++
++PY3 = sys.version_info[0] == 3
++extra_compile_args = ['-Wall']
++extra_link_args = ['-lcfitsio']
++
++try:
++    if PY3:
++        extra_compile_args = subprocess.check_output(['pkg-config', '--cflags', 'cfitsio']).decode().split()
++        extra_link_args = subprocess.check_output(['pkg-config', '--libs', 'cfitsio']).decode().split()
++    else:
++        extra_compile_args = subprocess.check_output(['pkg-config', '--cflags', 'cfitsio']).split()
++        extra_link_args = subprocess.check_output(['pkg-config', '--libs', 'cfitsio']).split()
++except subprocess.CalledProcessError:
++    print('!!! pkg-config failure, skipping flag generation !!!')
++    pass
+ 
+ setup(
+     setup_requires=['d2to1>=0.2.12', 'stsci.distutils>=0.3'],
+     d2to1=True,
+-    zip_safe=False
++    use_2to3=True,
++    zip_safe=False,
++    ext_modules = [
++        Extension('pyfits.compression', ['src/compressionmodule.c'],
++                  include_dirs=['numpy'],
++                  extra_compile_args=extra_compile_args,
++                  extra_link_args=extra_link_args,
++                  optional=True)
++        ],
+ )