From c8b6fbe930cf8db6f235207ebcde2d16eef503b1 Mon Sep 17 00:00:00 2001 From: Sergio Pascual Date: Mon, 4 Mar 2019 18:47:24 +0100 Subject: [PATCH] New version (3.1.2) --- .gitignore | 1 + python-astropy-system-configobj.patch | 16 ++++++------ python-astropy.spec | 37 ++++++++++++++++----------- sources | 2 +- 4 files changed, 32 insertions(+), 24 deletions(-) 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 - 3.1.2-1 +- New version (3.1.2) + * Sat Feb 02 2019 Fedora Release Engineering - 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