diff --git a/.gitignore b/.gitignore index b594de1..fd6c4a6 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ /astropy-3.0.4.tar.gz /astropy-3.0.5.tar.gz /astropy-3.1.2.tar.gz +/astropy-3.2.1.tar.gz diff --git a/8b3d0ccc2381919c8de944caa6485eb88d13e819.patch b/8b3d0ccc2381919c8de944caa6485eb88d13e819.patch deleted file mode 100644 index 3758fdb..0000000 --- a/8b3d0ccc2381919c8de944caa6485eb88d13e819.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 8b3d0ccc2381919c8de944caa6485eb88d13e819 Mon Sep 17 00:00:00 2001 -From: Thomas Robitaille -Date: Thu, 6 Jun 2019 09:49:48 +0200 -Subject: [PATCH] Fix import from collections - ---- - astropy/utils/timer.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/astropy/utils/timer.py b/astropy/utils/timer.py -index 30519b9f681..c9d0bacdb5f 100644 ---- a/astropy/utils/timer.py -+++ b/astropy/utils/timer.py -@@ -4,7 +4,8 @@ - # STDLIB - import time - import warnings --from collections import Iterable, OrderedDict -+from collections import OrderedDict -+from collections.abc import Iterable - from functools import partial, wraps - - # THIRD-PARTY diff --git a/python-astropy-fix-pyyaml5-8500.patch b/python-astropy-fix-pyyaml5-8500.patch deleted file mode 100644 index c1c17b9..0000000 --- a/python-astropy-fix-pyyaml5-8500.patch +++ /dev/null @@ -1,49 +0,0 @@ -From c531e498de2c4d39a0eccc02f92a3645a8394dee Mon Sep 17 00:00:00 2001 -From: Tom Aldcroft -Date: Fri, 15 Mar 2019 11:30:46 -0400 -Subject: [PATCH 1/2] Set YAML default_flow_style=None for consistent output - with PyYAML version >= 5.1 - ---- - astropy/io/misc/tests/test_hdf5.py | 3 ++- - astropy/io/misc/yaml.py | 1 + - astropy/table/meta.py | 3 ++- - 4 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/astropy/io/misc/tests/test_hdf5.py b/astropy/io/misc/tests/test_hdf5.py -index 25f29ebc5ed..9ab6924bee3 100644 ---- a/astropy/io/misc/tests/test_hdf5.py -+++ b/astropy/io/misc/tests/test_hdf5.py -@@ -538,7 +538,8 @@ def test_fail_meta_serialize(tmpdir): - - with pytest.raises(Exception) as err: - t1.write(test_file, path='the_table', serialize_meta=True) -- assert "cannot represent an object: " in str(err) -+ assert "cannot represent an object" in str(err) -+ assert "" in str(err) - - - @pytest.mark.skipif('not HAS_H5PY') -diff --git a/astropy/io/misc/yaml.py b/astropy/io/misc/yaml.py -index 6f5146c432b..5276ed7d8fe 100644 ---- a/astropy/io/misc/yaml.py -+++ b/astropy/io/misc/yaml.py -@@ -352,4 +352,5 @@ def dump(data, stream=None, **kwargs): - - """ - kwargs['Dumper'] = AstropyDumper -+ kwargs.setdefault('default_flow_style', None) - return yaml.dump(data, stream=stream, **kwargs) -diff --git a/astropy/table/meta.py b/astropy/table/meta.py -index 9b55522a72b..8837cb3db12 100644 ---- a/astropy/table/meta.py -+++ b/astropy/table/meta.py -@@ -287,7 +287,8 @@ def represent_mapping(self, tag, mapping, flow_style=None): - header['datatype'] = [_get_col_attributes(col) for col in header['cols']] - del header['cols'] - -- lines = yaml.dump(header, Dumper=TableDumper, width=130).splitlines() -+ lines = yaml.dump(header, default_flow_style=None, -+ Dumper=TableDumper, width=130).splitlines() - return lines - diff --git a/python-astropy.spec b/python-astropy.spec index 9cf2249..2b0afa7 100644 --- a/python-astropy.spec +++ b/python-astropy.spec @@ -11,8 +11,8 @@ %global srcname astropy Name: python-astropy -Version: 3.1.2 -Release: 3%{?dist} +Version: 3.2.1 +Release: 1%{?dist} Summary: A Community Python Library for Astronomy License: BSD @@ -22,25 +22,20 @@ Source1: astropy-README.dist Source2: astropy-ply.py Patch0: python-astropy-system-configobj.patch Patch1: python-astropy-system-six.patch -# Import upstream fix for PyYAML 5 -# https://github.com/astropy/astropy/pull/8500 -Patch2: python-astropy-fix-pyyaml5-8500.patch - -Patch3: https://github.com/astropy/astropy/commit/8b3d0ccc2381919c8de944caa6485eb88d13e819.patch BuildRequires: gcc BuildRequires: git -BuildRequires: cfitsio-devel +BuildRequires: cfitsio-devel >= 3.45 BuildRequires: expat-devel %if %{with system_erfa} -BuildRequires: erfa-devel +BuildRequires: erfa-devel >= 1.4.0 %else -Provides: bundled(erfa) = 1.3.0 +Provides: bundled(erfa) = 1.4.0 %endif %if %{with system_wcslib} -BuildRequires: wcslib-devel >= 5.19 +BuildRequires: wcslib-devel >= 6.2 %else -Provides: bundled(wcslib) = 5.19 +Provides: bundled(wcslib) = 6.2 %endif BuildRequires: texlive-ucs BuildRequires: graphviz @@ -137,10 +132,6 @@ rm -rf astropy*egg-info %patch1 -p1 # Use system ply cp %{SOURCE2} astropy/extern/ply.py -# Fix for PyYAML 5.x -%patch2 -p1 - -%patch3 -p1 # Force Cython re-run echo "cython_version = 'unknown'" > astropy/cython_version.py @@ -190,8 +181,9 @@ export PYTEST_ADDOPTS='-p no:cacheprovider' # # Tests on s390x tend to stuck (already for scipy used by astropy) %ifnarch s390x -pushd %{buildroot}/%{python3_sitearch} - py.test-%{python3_version} -k "not test_scale_back_with_blanks" astropy + pushd %{buildroot}/%{python3_sitearch} + #py.test-%{python3_version} -k "not test_scale_back_with_blanks" astropy + py.test-%{python3_version} astropy popd %endif @@ -210,6 +202,11 @@ popd %changelog + +* Thu Aug 01 2019 Sergio Pascual - 3.2.1-1 +- New upstream version (3.2.1) +- Remove patches included upsteam + * Fri Jul 26 2019 Fedora Release Engineering - 3.1.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 1d98958..0a1fb96 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (astropy-3.1.2.tar.gz) = ca2a3c04bd5ff30abe6c05b0f1f8608ac1fc8ea53c93bca5aa5e61c8dd8e7fc53230294c68623770406f5d52135275819e5dc4a68779b1501edd6713d1d2599e +SHA512 (astropy-3.2.1.tar.gz) = b468e6a6cd45052d4cd0cac34969ffa53f89ed8bdbdcd4aae627d4ce55043be24ba739534129b3fec1511b4f113a991209b819d5b3ad1429104f46cb205d26ec