diff options
Diffstat (limited to 'pyfits')
-rw-r--r-- | pyfits/pyfits-cfitsio.patch | 48 | ||||
-rw-r--r-- | pyfits/pyfits.ini | 51 |
2 files changed, 0 insertions, 99 deletions
diff --git a/pyfits/pyfits-cfitsio.patch b/pyfits/pyfits-cfitsio.patch deleted file mode 100644 index 64e7057..0000000 --- a/pyfits/pyfits-cfitsio.patch +++ /dev/null @@ -1,48 +0,0 @@ -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) -+ ], - ) diff --git a/pyfits/pyfits.ini b/pyfits/pyfits.ini deleted file mode 100644 index 7e891f9..0000000 --- a/pyfits/pyfits.ini +++ /dev/null @@ -1,51 +0,0 @@ -[package] -name: astropy -version: {{ environ.get("GIT_DESCRIBE_TAG", "0.0.0") }}.git - -[about] -home: https://github.com/spacetelescope/${package:name} -license: GPL -summary: ${package:name} - -[source] -git_url: ${about:home}.git - -patches: - ${package:name}-cfitsio.patch [py3k] - -[build] -number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} -preserve_egg_dir: True - -[requirements] -build: - setuptools - yaml - pyyaml - d2to1 - stsci.distutils - pkgconfig - cfitsio - pkg-config [osx] - numpy - python - -run: - stsci.distutils - setuptools - yaml - pyyaml - cfitsio - 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: - python setup.py install - if errorlevel 1 exit 1 |