diff --git a/.gitignore b/.gitignore index e32522d..0e9fc27 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /astropy-3.0.1.tar.gz /astropy-3.0.2.tar.gz /astropy-3.0.3.tar.gz +/astropy-3.0.4.tar.gz diff --git a/python-astropy-Mark-all-known-test-failures-as-xfail.patch b/python-astropy-Mark-all-known-test-failures-as-xfail.patch deleted file mode 100644 index a107f82..0000000 --- a/python-astropy-Mark-all-known-test-failures-as-xfail.patch +++ /dev/null @@ -1,50 +0,0 @@ -From: Ole Streicher -Date: Fri, 16 Feb 2018 10:18:22 +0100 -Subject: Mark all known test failures as xfail - ---- - astropy/io/fits/tests/test_convenience.py | 2 ++ - astropy/io/fits/tests/test_core.py | 2 ++ - astropy/io/fits/tests/test_fitstime.py | 3 ++- - 3 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/astropy/io/fits/tests/test_convenience.py b/astropy/io/fits/tests/test_convenience.py -index 50adf1f..a9c941d 100644 ---- a/astropy/io/fits/tests/test_convenience.py -+++ b/astropy/io/fits/tests/test_convenience.py -@@ -140,6 +140,8 @@ class TestConvenience(FitsTestCase): - with pytest.raises(NotImplementedError): - printdiff(in1, in2, 0) - -+ @pytest.mark.xfail(raises=PermissionError, -+ reason="see https://github.com/astropy/astropy/issues/7201") - def test_tabledump(self): - """ - Regression test for https://github.com/astropy/astropy/issues/6937 -diff --git a/astropy/io/fits/tests/test_core.py b/astropy/io/fits/tests/test_core.py -index 205982a..5a7c69f 100644 ---- a/astropy/io/fits/tests/test_core.py -+++ b/astropy/io/fits/tests/test_core.py -@@ -591,6 +591,8 @@ class TestFileFunctions(FitsTestCase): - assert os.path.exists(self.temp('foobar.fits')) - os.remove(self.temp('foobar.fits')) - -+ @pytest.mark.xfail(raises=PermissionError, -+ reason="see https://github.com/astropy/astropy/issues/7201") - def test_open_file_handle(self): - # Make sure we can open a FITS file from an open file handle - with open(self.data('test0.fits'), 'rb') as handle: -diff --git a/astropy/io/fits/tests/test_fitstime.py b/astropy/io/fits/tests/test_fitstime.py -index cc11b81..270a11e 100644 ---- a/astropy/io/fits/tests/test_fitstime.py -+++ b/astropy/io/fits/tests/test_fitstime.py -@@ -301,7 +301,8 @@ class TestFitsTime(FitsTestCase): - assert isinstance(tm['datetime'], Time) - assert tm['datetime'].location.lon.value == 0 - assert tm['datetime'].location.lat.value == 0 -- assert tm['datetime'].location.height.value == 0 -+# see issue https://github.com/astropy/astropy/issues/7198 -+# assert tm['datetime'].location.height.value == 0 - - @pytest.mark.parametrize('table_types', (Table, QTable)) - def test_io_time_read_fits_scale(self, table_types): diff --git a/python-astropy.spec b/python-astropy.spec index 20283a1..a5c1776 100644 --- a/python-astropy.spec +++ b/python-astropy.spec @@ -11,20 +11,21 @@ %global srcname astropy Name: python-astropy -Version: 3.0.3 -Release: 5%{?dist} +Version: 3.0.4 +Release: 1%{?dist} Summary: A Community Python Library for Astronomy License: BSD URL: http://astropy.org -Source0: https://pypi.io/packages/source/a/astropy/astropy-%{version}.tar.gz +Source0: %{pypi_source} Source1: astropy-README.dist Source2: astropy-ply.py Patch0: python-astropy-system-configobj.patch Patch1: python-astropy-system-six.patch -# Disable known failing tests, taken from Debian -# https://salsa.debian.org/debian-astro-team/astropy/blob/3b20ea052ab8bd0af505380eb4f0c357c901bb3b/debian/patches/Mark-all-known-test-failures-as-xfail.patch -Patch2: python-astropy-Mark-all-known-test-failures-as-xfail.patch + +# Exclude s390x until broken numpy is fixed +# https://bugzilla.redhat.com/show_bug.cgi?id=1610996 +ExcludeArch: s390x BuildRequires: gcc BuildRequires: git @@ -138,8 +139,9 @@ rm -rf astropy*egg-info %patch1 -p1 # Use system ply cp %{SOURCE2} astropy/extern/ply.py -# Mark known test failures as xfail -%patch2 -p1 + +# Force Cython re-run +echo "cython_version = 'unknown'" > astropy/cython_version.py # Remove expat, erfa, cfitsio and wcslib rm -rf cextern/cfitsio @@ -177,17 +179,24 @@ rm -f docs/_build/html/.buildinfo find %{buildroot} -name "*.so" | xargs chmod 755 %check -# Disable tests until we have that fix in Fedoray pyyaml package -# check: https://github.com/yaml/pyyaml/pull/181 +# 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 -#pushd %%{buildroot}/%%{python3_sitearch} -#py.test-%%{python3_version} -k "not test_write_read_roundtrip" 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 -#popd -#%%endif # ifnarch s390x +rm -fr .pytest_cache +popd +%endif # ifnarch s390x %{power64} +# Execute tests on power64 excluding failing test_str() and test_fail_meta_serialize() +%ifarch %{power64} +pushd %{buildroot}/%{python3_sitearch} +py.test-%{python3_version} -k "(not test_fail_meta_serialize or test_str)" astropy +# Remove spurious test relict +rm -fr .pytest_cache +popd +%endif # ifarch %{power64} %files -n %{srcname}-tools @@ -202,7 +211,13 @@ find %{buildroot} -name "*.so" | xargs chmod 755 %doc README.rst README.dist docs/_build/html %license LICENSE.rst + %changelog +* Fri Aug 03 2018 Christian Dersch - 3.0.4-1 +- new version (3.0.4) +- reenable tests +- ExcludeArch s390x until #1610996 is fixed + * Sun Jul 15 2018 Christian Dersch - 3.0.3-5 - BuildRequires: gcc diff --git a/sources b/sources index f5973c3..626dd07 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (astropy-3.0.3.tar.gz) = d03bb80ef20d20e467f64a54c80952cdaa5c85654d3762e8b26f53748d80879a2205e838cb358791b620e0c9aad3b92033f575cece41af33738cb8706e73610b +SHA512 (astropy-3.0.4.tar.gz) = 05afa3f527bd2176d7264438bb379bb470c8c251d45c429630c03612d05eb2ede2528a5cec483494c9e81213d1136b8119baa1c047d15786764cfe6fb1281bd9