The package rpms/python-MDAnalysis.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-MDAnalysis.git/commit/?id=6f2....
Change: +ExcludeArch: i686 armv7hl s390x ppc64le aarch64
Thanks.
Full change: ============
commit 6f231a2656f9ad4c15676a05638c82aa2d02ff75 Author: Christoph Junghans junghans@lanl.gov Date: Wed Sep 4 10:39:31 2019 -0600
Version bump to 0.20.1
diff --git a/.gitignore b/.gitignore index 60277bb..c95755f 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,7 @@ /MDAnalysis-0.18.0.tar.gz /MDAnalysisTests-0.18.0.tar.gz /pypidoc.zip +/MDAnalysis-0.20.0.tar.gz +/MDAnalysisTests-0.20.0.tar.gz +/MDAnalysis-0.20.1.tar.gz +/MDAnalysisTests-0.20.1.tar.gz diff --git a/python-MDAnalysis-32bit.patch b/python-MDAnalysis-32bit.patch index b8845eb..c6b42f6 100644 --- a/python-MDAnalysis-32bit.patch +++ b/python-MDAnalysis-32bit.patch @@ -39,8 +39,8 @@ diff -up MDAnalysis-0.18.0/MDAnalysis/analysis/encore/clustering/include/ap.h.32
int sqmIndex(int, int, int); @@ -27,4 +29,4 @@ float min(float*, int); + #endif
- float max(float*, int);
-int CAffinityPropagation(float*, int, float, int, int, int, long*); +int CAffinityPropagation(float*, int, float, int, int, int, int64_t*); @@ -64,21 +64,9 @@ diff -up MDAnalysis-0.18.0/MDAnalysis/analysis/encore/clustering/src/ap.c.32bit
/* n: number of elements s: similarity matrix -diff -up MDAnalysis-0.18.0/MDAnalysis/lib/formats/libdcd.pyx.32bit MDAnalysis-0.18.0/MDAnalysis/lib/formats/libdcd.pyx ---- MDAnalysis-0.18.0/MDAnalysis/lib/formats/libdcd.pyx.32bit 2018-04-22 19:06:55.000000000 +0200 -+++ MDAnalysis-0.18.0/MDAnalysis/lib/formats/libdcd.pyx 2018-07-02 15:41:51.359803083 +0200 -@@ -653,7 +653,7 @@ cdef class DCDFile: - - cdef np.ndarray[np.int64_t, ndim=1] c_indices - if indices is None: -- c_indices = np.arange(self.natoms) -+ c_indices = np.arange(self.natoms, dtype=np.int64) - natoms = self.natoms - else: - natoms = len(indices) diff -up MDAnalysis-0.18.0/MDAnalysisTests-0.18.0/MDAnalysisTests/analysis/test_encore.py.32bit MDAnalysis-0.18.0/MDAnalysisTests-0.18.0/MDAnalysisTests/analysis/test_encore.py ---- MDAnalysis-0.18.0/MDAnalysisTests-0.18.0/MDAnalysisTests/analysis/test_encore.py.32bit 2018-04-15 21:56:44.000000000 +0200 -+++ MDAnalysis-0.18.0/MDAnalysisTests-0.18.0/MDAnalysisTests/analysis/test_encore.py 2018-07-02 15:41:51.360803093 +0200 +--- MDAnalysis-0.20.0/MDAnalysisTests-0.20.0/MDAnalysisTests/analysis/test_encore.py.32bit 2018-04-15 21:56:44.000000000 +0200 ++++ MDAnalysis-0.20.0/MDAnalysisTests-0.20.0/MDAnalysisTests/analysis/test_encore.py 2018-07-02 15:41:51.360803093 +0200 @@ -262,7 +262,7 @@ inconsistent results") clustering_method=encore.AffinityPropagationNative(preference = -3.0)) result_value = results[0,1] diff --git a/python-MDAnalysis-duecredit.patch b/python-MDAnalysis-duecredit.patch deleted file mode 100644 index 0604579..0000000 --- a/python-MDAnalysis-duecredit.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up MDAnalysis-0.18.0/MDAnalysisTests-0.18.0/MDAnalysisTests/utils/test_duecredits.py.orig MDAnalysis-0.18.0/MDAnalysisTests-0.18.0/MDAnalysisTests/utils/test_duecredits.py ---- MDAnalysis-0.18.0/MDAnalysisTests-0.18.0/MDAnalysisTests/utils/test_duecredits.py.orig 2018-04-15 21:57:08.000000001 +0200 -+++ MDAnalysis-0.18.0/MDAnalysisTests-0.18.0/MDAnalysisTests/utils/test_duecredits.py 2018-07-02 16:42:56.949956938 +0200 -@@ -28,6 +28,10 @@ import pytest - # to work; duecredit must also be installed) - import MDAnalysis as mda - -+# duecredit itself is not needed in the name space but this is a -+# convenient way to skip all tests if duecredit is not installed -+# (see https://github.com/MDAnalysis/mdanalysis/issues/1906) -+pytest.importorskip('duecredit') - - @pytest.mark.skipif((os.environ.get('DUECREDIT_ENABLE', 'yes').lower() - in ('no', '0', 'false')), diff --git a/python-MDAnalysis.spec b/python-MDAnalysis.spec index c43571c..28b64a7 100644 --- a/python-MDAnalysis.spec +++ b/python-MDAnalysis.spec @@ -2,8 +2,8 @@ %bcond_without check
Name: python-%{pname} -Version: 0.18.0 -Release: 4%{?dist} +Version: 0.20.1 +Release: 1%{?dist} Summary: Analyze and manipulate molecular dynamics trajectories License: GPLv2+ and BSD and MIT and CC-BY-ND # BSD: @@ -23,14 +23,10 @@ Source1: https://files.pythonhosted.org/packages/source/M/%%7Bpname%7DTests/%%7Bpname... Source2: https://github.com/%%7Bpname%7D/mdanalysis/files/1935925/pypidoc.zip # force rebuild of cythonized intermediate sources Patch1: %{name}-cython.patch -# fix some failing tests on 32bit arches -# https://github.com/MDAnalysis/mdanalysis/issues/1362 -Patch2: %{name}-32bit.patch -Patch3: %{name}-flags.patch -# https://github.com/MDAnalysis/mdanalysis/issues/1906 -# and duecredit is not packaged in Fedora -Patch4: %{name}-duecredit.patch - +Patch2: %{name}-flags.patch +# 32-bit archs: https://github.com/MDAnalysis/mdanalysis/issues/2342 +# ppc64le, aarch64: https://github.com/MDAnalysis/mdanalysis/issues/2343 +ExcludeArch: i686 armv7hl s390x ppc64le aarch64 # we don't want to provide private python extension libs in python3 dirs # there are actually called lib...so, so this is needed %global __provides_exclude_from ^%{python3_sitearch}/.*\.so$ @@ -88,6 +84,7 @@ BuildRequires: python3-pytest-xdist BuildRequires: python3-scikit-learn BuildRequires: python3-tempdir %endif +BuildRequires: gcc-c++ # MDAnalysis/coordinates/xdrfile/src Provides: bundled(xdrfile) = 0.7.7 %{?python_provide:%python_provide python3-%{pname}} @@ -110,9 +107,7 @@ This package contains the documentation %prep %setup -q -n %{pname}-%{version} -a 1 %patch1 -p1 -b .cython -%patch2 -p1 -b .32bit -%patch3 -p1 -b .flags -%patch4 -p1 -b .due +%patch2 -p1 -b .flags # force rebuild of Egg Metadata rm -r %{pname}.egg-info rm -r %{pname}Tests-%{version}/%{pname}Tests.egg-info @@ -187,6 +182,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib}:%{buildroot}%{python3_sitearch} \ %doc doc/html/*
%changelog +* Wed Sep 11 2019 Christoph Junghans junghans@votca.org - 0.20.1-1 +- Version bump to 0.20.1 + * Fri Jul 26 2019 Fedora Release Engineering releng@fedoraproject.org - 0.18.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
diff --git a/sources b/sources index a42acca..f37a71b 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ -SHA512 (MDAnalysis-0.18.0.tar.gz) = b235471c04ab2e117fe25e972d88a6245b1641f96d30eafd2f68949c8af8c1360eed49b1ec9960d8c386c0bbca8b3749cec322eb19f9975f15225983af0f5819 -SHA512 (MDAnalysisTests-0.18.0.tar.gz) = d3945046c7949a7120273dc9bc707f52e284438fdf4d831be320401696f545e490e820c552188d6718ff78476a662d3510b2f4ab378e978206996d652a4cb683 -SHA512 (pypidoc.zip) = 574506cad8f3935e6d5bf7b2bd4e9a7d298a8c29f35e70c3ac4d51c9f33c073f2ad8fa824f2d62121b8745318c967b1cef06965c155a66cece9f37e0b662abc5 +SHA512 (MDAnalysis-0.20.1.tar.gz) = 9b3e5b5e600a9250923952d329052fbefa699a3b24acfc34b6157714e3797641c0de229be5322e8c954d2a45fb5556e0fe30a60958022c24199173d3345a2152 +SHA512 (MDAnalysisTests-0.20.1.tar.gz) = afdd1f063a600075dd8554a37d48acaccd9540fdfc5909d57bcf1be46acbadb9b376c2a57b2b2877ee5bad43f4bb8e53df3f9d8a3492b133e954335fa4527c79
arch-excludes@lists.fedoraproject.org