diff --git a/.gitignore b/.gitignore index 98891f8..e0d2e9f 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /astropy-0.4.2.tar.gz /astropy-0.4.3.tar.gz /astropy-0.4.4.tar.gz +/astropy-0.4.5.tar.gz diff --git a/python-astropy-backport-six15.patch b/python-astropy-backport-six15.patch deleted file mode 100644 index 3be2982..0000000 --- a/python-astropy-backport-six15.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -ur lib.linux-x86_64-3.3/astropy/io/misc/tests/test_hdf5.py lib.linux-x86_64-3.3fix/astropy/io/misc/tests/test_hdf5.py ---- lib.linux-x86_64-3.3/astropy/io/misc/tests/test_hdf5.py 2014-03-22 01:01:35.923603681 +0100 -+++ lib.linux-x86_64-3.3fix/astropy/io/misc/tests/test_hdf5.py 2014-03-22 00:57:32.590614870 +0100 -@@ -352,7 +352,7 @@ - - - @pytest.mark.skipif('not HAS_H5PY') --def test_skip_meta(tmpdir): -+def no_test_skip_meta(tmpdir): - - test_file = str(tmpdir.join('test.hdf5')) - -diff -ur lib.linux-x86_64-3.3/astropy/tests/helper.py lib.linux-x86_64-3.3fix/astropy/tests/helper.py ---- lib.linux-x86_64-3.3/astropy/tests/helper.py 2014-03-22 00:02:26.000000000 +0100 -+++ lib.linux-x86_64-3.3fix/astropy/tests/helper.py 2014-03-22 00:40:47.401385121 +0100 -@@ -21,6 +21,7 @@ - import shutil - import tempfile - import warnings -+import types - - try: - # Import pkg_resources to prevent it from issuing warnings upon being -@@ -492,15 +493,12 @@ - assert len(w) > 0 - """ - def __init__(self, *classes): -- for module in list(six.itervalues(sys.modules)): -- if hasattr(module, '__warningregistry__'): -- del module.__warningregistry__ - super(catch_warnings, self).__init__(record=True) - self.classes = classes - - def __enter__(self): - warning_list = super(catch_warnings, self).__enter__() -- warnings.resetwarnings() -+ treat_deprecations_as_exceptions() - if len(self.classes) == 0: - warnings.simplefilter('always') - else: -@@ -509,6 +507,8 @@ - warnings.simplefilter('always', cls) - return warning_list - -+ def __exit__(self, type, value, traceback): -+ treat_deprecations_as_exceptions() - - def assert_follows_unicode_guidelines( - x, roundtrip=None): -@@ -570,3 +570,16 @@ - assert x.__class__(bytes_x) == x - assert x.__class__(unicode_x) == x - assert eval(repr_x, roundtrip) == x -+ -+ -+ -+def treat_deprecations_as_exceptions(): -+ for module in list(six.itervalues(sys.modules)): -+ # We don't want to deal with six.MovedModules, only "real" -+ # modules. -+ if (isinstance(module, types.ModuleType) and -+ hasattr(module, '__warningregistry__')): -+ del module.__warningregistry__ -+ -+ warnings.resetwarnings() -+ warnings.simplefilter('ignore', DeprecationWarning) diff --git a/python-astropy-bug2171.patch b/python-astropy-bug2171.patch deleted file mode 100644 index d7bf353..0000000 --- a/python-astropy-bug2171.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -ur astropy-0.3.2/astropy/io/fits/hdu/base.py astropy-0.3.2.checksum/astropy/io/fits/hdu/base.py ---- astropy-0.3.2/astropy/io/fits/hdu/base.py 2014-05-19 15:50:15.540882206 +0200 -+++ astropy-0.3.2.checksum/astropy/io/fits/hdu/base.py 2014-05-19 15:51:32.084487630 +0200 -@@ -1581,8 +1581,8 @@ - - hi = sum32 >> u16 - lo = sum32 & uFFFF -- hi += np.add.reduce(bytes[0::2]) -- lo += np.add.reduce(bytes[1::2]) -+ hi += np.add.reduce(bytes[0::2], dtype=np.uint64) -+ lo += np.add.reduce(bytes[1::2], dtype=np.uint64) - - if (bytes.nbytes // 2) % 2: - lo += last << u8 -diff -ur astropy-0.3.2/astropy/io/fits/tests/test_checksum.py astropy-0.3.2.checksum/astropy/io/fits/tests/test_checksum.py ---- astropy-0.3.2/astropy/io/fits/tests/test_checksum.py 2014-05-19 15:50:15.549882277 +0200 -+++ astropy-0.3.2.checksum/astropy/io/fits/tests/test_checksum.py 2014-05-19 15:52:39.844024043 +0200 -@@ -42,7 +42,7 @@ - hdul.close() - - def test_image_create(self): -- n = np.arange(100) -+ n = np.arange(100, dtype=np.int64) - hdu = fits.PrimaryHDU(n) - hdu.writeto(self.temp('tmp.fits'), clobber=True, checksum=True) - with fits.open(self.temp('tmp.fits'), checksum=True) as hdul: -@@ -57,7 +57,7 @@ - assert hdul[0].header['DATASUM'] == '4950' - - def test_nonstandard_checksum(self): -- hdu = fits.PrimaryHDU(np.arange(10.0 ** 6)) -+ hdu = fits.PrimaryHDU(np.arange(10.0 ** 6, dtype=np.float64)) - hdu.writeto(self.temp('tmp.fits'), clobber=True, - checksum='nonstandard') - del hdu diff --git a/python-astropy-install.patch b/python-astropy-install.patch deleted file mode 100644 index 5ab1667..0000000 --- a/python-astropy-install.patch +++ /dev/null @@ -1,121 +0,0 @@ -From f80125940eaa93ec0b2d0f579fcaaaff07698344 Mon Sep 17 00:00:00 2001 -From: Michael Droettboom -Date: Mon, 24 Mar 2014 12:20:08 -0400 -Subject: [PATCH] Override Install and InstallLib commands to also adjust the - library directory to be the platform-specific one. [#2223] - ---- - astropy/setup_helpers.py | 73 +++++++++++++++++++++++++++++++----------------- - 1 file changed, 47 insertions(+), 26 deletions(-) - -diff --git a/astropy/setup_helpers.py b/astropy/setup_helpers.py -index 2cfadbd..536bc1e 100644 ---- a/astropy/setup_helpers.py -+++ b/astropy/setup_helpers.py -@@ -28,6 +28,8 @@ - from distutils.command.sdist import sdist as DistutilsSdist - from setuptools.command.build_ext import build_ext as SetuptoolsBuildExt - from setuptools.command.build_py import build_py as SetuptoolsBuildPy -+from setuptools.command.install import install as SetuptoolsInstall -+from setuptools.command.install_lib import install_lib as SetuptoolsInstallLib - - from setuptools.command.register import register as SetuptoolsRegister - from setuptools import find_packages -@@ -362,19 +364,25 @@ def register_commands(package, version, release): - _registered_commands = { - 'test': generate_test_command(package), - -- # Use distutils' sdist because it respects package_data. -- # setuptools/distributes sdist requires duplication of information in -- # MANIFEST.in -- 'sdist': DistutilsSdist, -+ # Use distutils' sdist because it respects package_data. -+ # setuptools/distributes sdist requires duplication of information in -+ # MANIFEST.in -+ 'sdist': DistutilsSdist, - -- # The exact form of the build_ext command depends on whether or not -- # we're building a release version -- 'build_ext': generate_build_ext_command(package, release), -+ # The exact form of the build_ext command depends on whether or not -+ # we're building a release version -+ 'build_ext': generate_build_ext_command(package, release), - -- # We have a custom build_py to generate the default configuration file -- 'build_py': AstropyBuildPy, -+ # We have a custom build_py to generate the default configuration file -+ 'build_py': AstropyBuildPy, - -- 'register': AstropyRegister -+ # Since install can (in some circumstances) be run without -+ # first building, we also need to override install and -+ # install_lib. See #2223 -+ 'install': AstropyInstall, -+ 'install_lib': AstropyInstallLib, -+ -+ 'register': AstropyRegister - } - - try: -@@ -542,6 +550,29 @@ def run(self): - return type('build_ext', (basecls, object), attrs) - - -+def _get_platlib_dir(cmd): -+ plat_specifier = '.{0}-{1}'.format(cmd.plat_name, sys.version[0:3]) -+ return os.path.join(cmd.build_base, 'lib' + plat_specifier) -+ -+ -+class AstropyInstall(SetuptoolsInstall): -+ -+ def finalize_options(self): -+ build_cmd = self.get_finalized_command('build') -+ platlib_dir = _get_platlib_dir(build_cmd) -+ self.build_lib = platlib_dir -+ SetuptoolsInstall.finalize_options(self) -+ -+ -+class AstropyInstallLib(SetuptoolsInstallLib): -+ -+ def finalize_options(self): -+ build_cmd = self.get_finalized_command('build') -+ platlib_dir = _get_platlib_dir(build_cmd) -+ self.build_dir = platlib_dir -+ SetuptoolsInstallLib.finalize_options(self) -+ -+ - class AstropyBuildPy(SetuptoolsBuildPy): - - def finalize_options(self): -@@ -550,22 +581,12 @@ def finalize_options(self): - # for projects with only pure-Python source (this is desirable - # specifically for support of multiple Python version). - build_cmd = self.get_finalized_command('build') -- plat_specifier = '.{0}-{1}'.format(build_cmd.plat_name, -- sys.version[0:3]) -- # Do this unconditionally -- build_purelib = os.path.join(build_cmd.build_base, -- 'lib' + plat_specifier) -- build_cmd.build_purelib = build_purelib -- build_cmd.build_lib = build_purelib -- -- # Ugly hack: We also need to 'fix' the build_lib option on the -- # install command--it would be better just to override that command -- # entirely, but we can get around that extra effort by doing it here -- install_cmd = self.get_finalized_command('install') -- install_cmd.build_lib = build_purelib -- install_lib_cmd = self.get_finalized_command('install_lib') -- install_lib_cmd.build_dir = build_purelib -- self.build_lib = build_purelib -+ platlib_dir = _get_platlib_dir(build_cmd) -+ -+ build_cmd.build_purelib = platlib_dir -+ build_cmd.build_lib = platlib_dir -+ self.build_lib = platlib_dir -+ - SetuptoolsBuildPy.finalize_options(self) - - def run_2to3(self, files, doctests=False): --- -1.8.5.5 - diff --git a/python-astropy-skiptest2171.patch b/python-astropy-skiptest2171.patch deleted file mode 100644 index e5b09ef..0000000 --- a/python-astropy-skiptest2171.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -ur astropy-0.3.2/astropy/io/fits/tests/test_checksum.py astropy-0.3.2.skip2171.patch/astropy/io/fits/tests/test_checksum.py ---- astropy-0.3.2/astropy/io/fits/tests/test_checksum.py 2014-05-26 18:28:14.308460414 +0200 -+++ astropy-0.3.2.skip2171.patch/astropy/io/fits/tests/test_checksum.py 2014-05-26 18:42:19.060391868 +0200 -@@ -42,6 +42,7 @@ - hdul.close() - - def test_image_create(self): -+ pytest.skip("Skip in Fedora. (github isssue 2171)") - n = np.arange(100) - hdu = fits.PrimaryHDU(n) - hdu.writeto(self.temp('tmp.fits'), clobber=True, checksum=True) -@@ -57,6 +58,7 @@ - assert hdul[0].header['DATASUM'] == '4950' - - def test_nonstandard_checksum(self): -+ pytest.skip("Skip in Fedora. (github isssue 2171)") - hdu = fits.PrimaryHDU(np.arange(10.0 ** 6)) - hdu.writeto(self.temp('tmp.fits'), clobber=True, - checksum='nonstandard') diff --git a/python-astropy-system-ply.patch b/python-astropy-system-ply.patch deleted file mode 100644 index 0b4da81..0000000 --- a/python-astropy-system-ply.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -ur astropy-0.3.2/astropy/coordinates/angle_utilities.py astropy-0.3.2.ply/astropy/coordinates/angle_utilities.py ---- astropy-0.3.2/astropy/coordinates/angle_utilities.py 2014-05-22 11:59:59.700577989 +0200 -+++ astropy-0.3.2.ply/astropy/coordinates/angle_utilities.py 2014-05-22 12:01:18.907194201 +0200 -@@ -51,7 +51,7 @@ - - @classmethod - def _make_parser(cls): -- from ..extern.ply import lex, yacc -+ from ply import lex, yacc - - # List of token names. - tokens = ( -diff -ur astropy-0.3.2/astropy/units/format/cds.py astropy-0.3.2.ply/astropy/units/format/cds.py ---- astropy-0.3.2/astropy/units/format/cds.py 2014-05-22 11:59:59.814578873 +0200 -+++ astropy-0.3.2.ply/astropy/units/format/cds.py 2014-05-22 12:01:32.922303728 +0200 -@@ -63,7 +63,7 @@ - YACC grammar in the `unity library - `_. - """ -- from ...extern.ply import lex, yacc -+ from ply import lex, yacc - - tokens = ( - 'PRODUCT', -diff -ur astropy-0.3.2/astropy/units/format/generic.py astropy-0.3.2.ply/astropy/units/format/generic.py ---- astropy-0.3.2/astropy/units/format/generic.py 2014-05-22 11:59:59.817578896 +0200 -+++ astropy-0.3.2.ply/astropy/units/format/generic.py 2014-05-22 12:01:48.698427183 +0200 -@@ -48,7 +48,7 @@ - formats, the only difference being the set of available unit - strings. - """ -- from ...extern.ply import lex, yacc -+ from ply import lex, yacc - - tokens = ( - 'DOUBLE_STAR', diff --git a/python-astropy-system-wcslib.patch b/python-astropy-system-wcslib.patch deleted file mode 100644 index f54774e..0000000 --- a/python-astropy-system-wcslib.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -ur astropy-0.3.2/astropy/wcs/setup_package.py astropy-0.3.2.wcslib/astropy/wcs/setup_package.py ---- astropy-0.3.2/astropy/wcs/setup_package.py 2014-05-21 11:19:24.260042437 +0200 -+++ astropy-0.3.2.wcslib/astropy/wcs/setup_package.py 2014-05-21 11:20:53.103770423 +0200 -@@ -309,10 +309,11 @@ - 'wcsmath.h', - 'wcsprintf.h', - ] -- for header in wcslib_headers: -- shutil.copy(join('cextern', 'wcslib', 'C', header), -+ if not setup_helpers.use_system_library('wcslib'): -+ for header in wcslib_headers: -+ shutil.copy(join('cextern', 'wcslib', 'C', header), - join('astropy', 'wcs', 'include', 'wcslib', header)) -- api_files.append(join('include', 'wcslib', header)) -+ api_files.append(join('include', 'wcslib', header)) - - return { - str('astropy.wcs.tests'): ['data/*.hdr', 'data/*.fits', diff --git a/python-astropy-wcslib320.patch b/python-astropy-wcslib320.patch deleted file mode 100644 index 2daaffd..0000000 --- a/python-astropy-wcslib320.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ur astropy-0.3/astropy/wcs/tests/data/validate.txt astropy-0.3.wcslib320/astropy/wcs/tests/data/validate.txt ---- astropy-0.3/astropy/wcs/tests/data/validate.txt 2013-11-21 01:59:14.000000000 +0100 -+++ astropy-0.3.wcslib320/astropy/wcs/tests/data/validate.txt 2014-01-10 11:21:45.889992784 +0100 -@@ -11,6 +11,6 @@ - WCS key ' ': - - The WCS transformation has more axes (3) than the image it is - associated with (0) -- - 'celfix' made the change 'In CUNIT2 : Mismatched units type -+ - 'celfix' made the change 'In CUNIT3 : Mismatched units type - 'length': have 'Hz', want 'm''. - - 'unitfix' made the change 'Changed units: 'HZ ' -> 'Hz''. diff --git a/python-astropy-wcslib323.patch b/python-astropy-wcslib323.patch deleted file mode 100644 index cc7fb85..0000000 --- a/python-astropy-wcslib323.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ur astropy-0.3.2/astropy/wcs/tests/test_wcsprm.py astropy-0.3.2.wcslib.423/astropy/wcs/tests/test_wcsprm.py ---- astropy-0.3.2/astropy/wcs/tests/test_wcsprm.py 2014-05-26 11:14:27.023648667 +0200 -+++ astropy-0.3.2.wcslib.423/astropy/wcs/tests/test_wcsprm.py 2014-05-26 11:13:49.630346134 +0200 -@@ -639,7 +639,7 @@ - - def test_velangl(): - w = _wcs.Wcsprm() -- assert w.velangl == 0.0 -+ assert np.isnan(w.velangl) - w.velangl = 42.0 - assert w.velangl == 42.0 - del w.velangl -diff -ur astropy-0.3.2/astropy/wcs/tests/test_wcs.py astropy-0.3.2.wcslib.423/astropy/wcs/tests/test_wcs.py ---- astropy-0.3.2/astropy/wcs/tests/test_wcs.py 2014-05-26 11:14:27.021648651 +0200 -+++ astropy-0.3.2.wcslib.423/astropy/wcs/tests/test_wcs.py 2014-05-26 11:14:41.149762955 +0200 -@@ -453,7 +453,7 @@ - - def test_to_header_string(): - header_string = """ -- WCSAXES = 2 / Number of coordinate axes CRPIX1 = 0 / Pixel coordinate of reference point CRPIX2 = 0 / Pixel coordinate of reference point CDELT1 = 1 / Coordinate increment at reference point CDELT2 = 1 / Coordinate increment at reference point CRVAL1 = 0 / Coordinate value at reference point CRVAL2 = 0 / Coordinate value at reference point LATPOLE = 90 / [deg] Native latitude of celestial pole RESTFRQ = 0 / [Hz] Line rest frequency RESTWAV = 0 / [Hz] Line rest wavelength END""" -+ WCSAXES = 2 / Number of coordinate axes CRPIX1 = 0.0 / Pixel coordinate of reference point CRPIX2 = 0.0 / Pixel coordinate of reference point CDELT1 = 1.0 / Coordinate increment at reference point CDELT2 = 1.0 / Coordinate increment at reference point CRVAL1 = 0.0 / Coordinate value at reference point CRVAL2 = 0.0 / Coordinate value at reference point LATPOLE = 90.0 / [deg] Native latitude of celestial pole END""" - - w = wcs.WCS() - assert w.to_header_string().strip() == header_string.strip() diff --git a/python-astropy.spec b/python-astropy.spec index 6f289b6..0783934 100644 --- a/python-astropy.spec +++ b/python-astropy.spec @@ -2,7 +2,7 @@ %global upname astropy Name: python-astropy -Version: 0.4.4 +Version: 0.4.5 Release: 1%{?dist} Summary: A Community Python Library for Astronomy License: BSD @@ -228,6 +228,9 @@ popd %endif # with_python3 %changelog +* Mon Feb 23 2015 Sergio Pascual - 0.4.5-1 +- New upstream (0.4.5) + * Thu Jan 22 2015 Sergio Pascual - 0.4.4-1 - New upstream (0.4.4) diff --git a/sources b/sources index ca5a6c9..8ce46cd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -68da956109c5968aaa8fdab8256049ba astropy-0.4.4.tar.gz +7b5bd80be3d0e5c5e050050cda6729bb astropy-0.4.5.tar.gz