The package rpms/python-astropy.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/python-astropy.git/commit/?id=589....
Change:
-%ifarch %{power64}
Thanks.
Full change:
============
commit 5890385a5883472788cb10c796aa62ce7ee289e0
Author: Christian Dersch <lupinix(a)fedoraproject.org>
Date: Fri Mar 29 15:26:02 2019 +0100
Imported upstream fix for PyYAML 5.x
diff --git a/python-astropy-fix-pyyaml5-8500.patch
b/python-astropy-fix-pyyaml5-8500.patch
new file mode 100644
index 0000000..c1c17b9
--- /dev/null
+++ b/python-astropy-fix-pyyaml5-8500.patch
@@ -0,0 +1,49 @@
+From c531e498de2c4d39a0eccc02f92a3645a8394dee Mon Sep 17 00:00:00 2001
+From: Tom Aldcroft <taldcroft(a)gmail.com>
+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: <class 'str'>" in
str(err)
++ assert "cannot represent an object" in str(err)
++ assert "<class 'str'>" 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 2c54455..0d4a54a 100644
--- a/python-astropy.spec
+++ b/python-astropy.spec
@@ -12,7 +12,7 @@
Name: python-astropy
Version: 3.1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A Community Python Library for Astronomy
License: BSD
@@ -22,6 +22,9 @@ 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
BuildRequires: gcc
BuildRequires: git
@@ -136,6 +139,8 @@ rm -rf astropy*egg-info
%patch1 -p1
# Use system ply
cp %{SOURCE2} astropy/extern/ply.py
+# Fix for PyYAML 5.x
+%patch2 -p1
# Force Cython re-run
echo "cython_version = 'unknown'" > astropy/cython_version.py
@@ -181,22 +186,14 @@ find %{buildroot} -name "*.so" | xargs chmod 755
export PYTHONDONTWRITEBYTECODE=1
export PYTEST_ADDOPTS='-p no:cacheprovider'
-# Disable test test_fail_meta_serialize until we have fixed Fedora pyyaml package
+# Disable test test_scale_back_with_blanks until we have a fix
#
# Tests on s390x tend to stuck (already for scipy used by astropy)
-%ifnarch s390x %{power64}
+%ifnarch s390x
pushd %{buildroot}/%{python3_sitearch}
- py.test-%{python3_version} -k "not test_fail_meta_serialize" astropy
+ py.test-%{python3_version} -k "not test_scale_back_with_blanks" astropy
popd
-%endif # ifnarch s390x %{power64}
-
-# Execute tests on power64 excluding failing test_str, test_fail_meta_serialize and
test_write_read_roundtrip
-%ifarch %{power64}
-pushd %{buildroot}/%{python3_sitearch}
- py.test-%{python3_version} -x -k "not (test_fail_meta_serialize or test_str or
test_write_read_roundtrip)" astropy
-popd
-%endif # ifarch %{power64}
-
+%endif # ifnarch s390x
%files -n %{srcname}-tools
%{_bindir}/*
@@ -213,6 +210,9 @@ popd
%changelog
+* Fri Mar 29 2019 Christian Dersch <lupinix(a)fedoraproject.org> - 3.1.2-2
+- Imported upstream fix for PyYAML 5.x
+
* Mon Mar 04 2019 Sergio Pascual <sergiopr(a)fedoraproject.org> - 3.1.2-1
- New version (3.1.2)
commit c8b6fbe930cf8db6f235207ebcde2d16eef503b1
Author: Sergio Pascual <sergiopr(a)fedoraproject.org>
Date: Mon Mar 4 18:47:24 2019 +0100
New version (3.1.2)
diff --git a/.gitignore b/.gitignore
index d806c95..b594de1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@
/astropy-3.0.3.tar.gz
/astropy-3.0.4.tar.gz
/astropy-3.0.5.tar.gz
+/astropy-3.1.2.tar.gz
diff --git a/python-astropy-system-configobj.patch
b/python-astropy-system-configobj.patch
index 72d116d..9a5f083 100644
--- a/python-astropy-system-configobj.patch
+++ b/python-astropy-system-configobj.patch
@@ -1,12 +1,12 @@
-diff -ur astropy-1.2.1/astropy/config/configuration.py
astropy-1.2.1.co/astropy/config/configuration.py
---- astropy-1.2.1/astropy/config/configuration.py 2016-06-22 16:32:13.000000000 +0200
-+++ astropy-1.2.1.co/astropy/config/configuration.py 2016-07-14 22:12:58.211075218 +0200
-@@ -19,7 +19,7 @@
+diff -ur astropy-3.1.1/astropy/config/configuration.py
astropy-3.1.1.configobj/astropy/config/configuration.py
+--- astropy-3.1.1/astropy/config/configuration.py 2019-01-01 00:54:51.000000000 +0100
++++ astropy-3.1.1.configobj/astropy/config/configuration.py 2019-02-17 18:48:51.688306288
+0100
+@@ -16,7 +16,7 @@
import re
from warnings import warn
--from ..extern.configobj import configobj, validate
+-from astropy.extern.configobj import configobj, validate
+import configobj, validate
- from ..utils.exceptions import AstropyWarning, AstropyDeprecationWarning
- from ..utils import find_current_module
- from ..utils.introspection import resolve_name
+ from astropy.utils.exceptions import AstropyWarning, AstropyDeprecationWarning
+ from astropy.utils import find_current_module
+ from astropy.utils.introspection import resolve_name
diff --git a/python-astropy.spec b/python-astropy.spec
index fc8348d..2c54455 100644
--- a/python-astropy.spec
+++ b/python-astropy.spec
@@ -11,8 +11,8 @@
%global srcname astropy
Name: python-astropy
-Version: 3.0.5
-Release: 2%{?dist}
+Version: 3.1.2
+Release: 1%{?dist}
Summary: A Community Python Library for Astronomy
License: BSD
@@ -33,11 +33,12 @@ BuildRequires: erfa-devel
Provides: bundled(erfa) = 1.3.0
%endif
%if %{with system_wcslib}
-BuildRequires: wcslib-devel >= 5.14
+BuildRequires: wcslib-devel >= 5.19
%else
-Provides: bundled(wcslib) = 5.16
+Provides: bundled(wcslib) = 5.19
%endif
BuildRequires: texlive-ucs
+BuildRequires: graphviz
%description
The Astropy project is a common effort to develop a single core package
@@ -59,7 +60,7 @@ BuildRequires: python%{python3_pkgversion}-six
BuildRequires: python%{python3_pkgversion}-ply
BuildRequires: python%{python3_pkgversion}-scipy
BuildRequires: python%{python3_pkgversion}-h5py
-BuildRequires: python%{python3_pkgversion}-sphinx graphviz
+BuildRequires: python%{python3_pkgversion}-sphinx
BuildRequires: python%{python3_pkgversion}-matplotlib
BuildRequires: python%{python3_pkgversion}-configobj
BuildRequires: python%{python3_pkgversion}-pandas
@@ -77,7 +78,7 @@ Requires: python%{python3_pkgversion}-PyYAML
Requires: /usr/bin/xmllint
%{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}}
-Provides: bundled(jquery) = 1.11
+Provides: bundled(jquery) = 3.11
# wcsaxes has been merged into astropy, therefore we obsolete and provide
# the old python3-wcsaxes package here
@@ -131,7 +132,7 @@ find -name wcsconfig.h -delete
rm -rf astropy*egg-info
# Use system configobj
%patch0 -p1
-## Use system six
+# Use system six
%patch1 -p1
# Use system ply
cp %{SOURCE2} astropy/extern/ply.py
@@ -166,7 +167,8 @@ echo "use_system_wcslib=1" >> setup.cfg
# Use cairo backend due to
https://bugzilla.redhat.com/show_bug.cgi?id=1394975
export MPLBACKEND=cairo
%{py3_build}
-%{__python3} setup.py build_sphinx --offline
+# Requires sphinx-astropy
+#%{__python3} setup.py build_docs --offline
rm -f docs/_build/html/.buildinfo
%install
@@ -175,22 +177,23 @@ rm -f docs/_build/html/.buildinfo
find %{buildroot} -name "*.so" | xargs chmod 755
%check
+# Avoid writing bad pyc files during testing
+export PYTHONDONTWRITEBYTECODE=1
+export PYTEST_ADDOPTS='-p no:cacheprovider'
+
# Disable test test_fail_meta_serialize until we have fixed Fedora pyyaml package
#
# Tests on s390x tend to stuck (already for scipy used by astropy)
%ifnarch s390x %{power64}
pushd %{buildroot}/%{python3_sitearch}
-py.test-%{python3_version} -k "not test_fail_meta_serialize" astropy
-# Remove spurious test relict
-rm -fr .pytest_cache
+ py.test-%{python3_version} -k "not test_fail_meta_serialize" astropy
popd
%endif # ifnarch s390x %{power64}
+
# Execute tests on power64 excluding failing test_str, test_fail_meta_serialize and
test_write_read_roundtrip
%ifarch %{power64}
pushd %{buildroot}/%{python3_sitearch}
-py.test-%{python3_version} -k "not (test_fail_meta_serialize or test_str or
test_write_read_roundtrip)" astropy
-# Remove spurious test relict
-rm -fr .pytest_cache
+ py.test-%{python3_version} -x -k "not (test_fail_meta_serialize or test_str or
test_write_read_roundtrip)" astropy
popd
%endif # ifarch %{power64}
@@ -204,11 +207,15 @@ popd
%{python3_sitearch}/*
%files -n python%{python3_pkgversion}-%{srcname}-doc
-%doc README.rst README.dist docs/_build/html
+##%doc README.rst README.dist docs/_build/html
+%doc README.rst README.dist
%license LICENSE.rst
%changelog
+* Mon Mar 04 2019 Sergio Pascual <sergiopr(a)fedoraproject.org> - 3.1.2-1
+- New version (3.1.2)
+
* Sat Feb 02 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.0.5-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
diff --git a/sources b/sources
index d523afc..1d98958 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (astropy-3.0.5.tar.gz) =
4a89e72795b67593bb598960c8cda75b574c4f59f6dcd816b49bd8c84524be7bede655b92ae48761cfcc55ec72553b3d1856a5e6522d2a3c72d73d9f0d5946b2
+SHA512 (astropy-3.1.2.tar.gz) =
ca2a3c04bd5ff30abe6c05b0f1f8608ac1fc8ea53c93bca5aa5e61c8dd8e7fc53230294c68623770406f5d52135275819e5dc4a68779b1501edd6713d1d2599e