The package rpms/python-pyphi.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-pyphi.git/commit/?id=1b489....
Change:
-%ifnarch s390x
Thanks.
Full change:
============
commit 17c116efccc1e087d2d512f11691d56021a7911e
Author: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur(a)gmail.com>
Date: Sun Oct 3 18:18:38 2021 +0100
feat: update to 1.2.1
diff --git a/.gitignore b/.gitignore
index 5132dbf..ee8eedb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/pyphi-1.1.0.tar.gz
/pyphi-1.2.0.tar.gz
+/pyphi-1.2.1.tar.gz
diff --git a/python-pyphi.spec b/python-pyphi.spec
index a848bee..e187c4a 100644
--- a/python-pyphi.spec
+++ b/python-pyphi.spec
@@ -1,6 +1,3 @@
-# Note: package is python 3 only
-%global srcname pyphi
-
%bcond_without tests
%global _description %{expand:
@@ -14,49 +11,36 @@ PyPhi: A toolbox for integrated information. arXiv:1712.09644
[q-bio.NC].
The manuscript is available at
https://arxiv.org/abs/1712.09644.}
-%{?python_enable_dependency_generator}
+%global forgeurl
https://github.com/wmayner/pyphi/
-Name: python-%{srcname}
-Version: 1.2.0
-Release: 13%{?dist}
+Name: python-pyphi
+Version: 1.2.1
+Release: %autorelease
Summary: A library for computing integrated information
-License: GPLv3
-URL:
https://github.com/wmayner/%{srcname}/
-Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
-BuildArch: noarch
+%global tag %{version}
+%forgemeta
+License: GPLv3
+URL: %forgeurl
+Source0: %forgesource
#
https://github.com/wmayner/pyphi/pull/50
Patch0: 0001-fix-py3.10-correct-collections-import.patch
BuildRequires: git-core
+BuildArch: noarch
%description %_description
-%package -n python3-%{srcname}
+%package -n python3-pyphi
Summary: %{summary}
BuildRequires: make
BuildRequires: python3-devel
-# To build docs, and run tests
-BuildRequires: %{py3_dist asv}
-BuildRequires: %{py3_dist decorator}
-BuildRequires: %{py3_dist joblib}
-BuildRequires: %{py3_dist numpy}
-BuildRequires: %{py3_dist psutil}
-BuildRequires: %{py3_dist pyemd}
-BuildRequires: %{py3_dist pymongo}
BuildRequires: %{py3_dist pytest}
BuildRequires: %{py3_dist pytest-lazy-fixture}
-BuildRequires: %{py3_dist pyyaml}
-BuildRequires: %{py3_dist redis}
-BuildRequires: %{py3_dist scipy}
BuildRequires: %{py3_dist sphinx}
BuildRequires: %{py3_dist sphinx_rtd_theme}
-BuildRequires: %{py3_dist setuptools}
-BuildRequires: %{py3_dist tblib}
-BuildRequires: %{py3_dist tqdm}
-BuildRequires: %{py3_dist wheel}
-%description -n python3-%{srcname} %_description
+%description -n python3-pyphi %_description
%package doc
Summary: %{summary}
@@ -66,7 +50,7 @@ Documentation for %{name}
%prep
-%autosetup -n %{srcname}-%{version} -S git
+%autosetup -n pyphi-%{version} -S git
# sphinx 1.3+, it's an extension
# Also sent upstream:
https://github.com/wmayner/pyphi/pull/22
@@ -74,35 +58,38 @@ sed -i "s/sphinxcontrib.napoleon/sphinx.ext.napoleon/"
docs/conf.py
find pyphi -name "*.py" -exec sed -i '/#!\/usr\/bin\/env python3/ d'
'{}' \;
+%generate_buildrequires
+%pyproject_buildrequires -r
+
%build
-%py3_build
+%pyproject_wheel
make -C docs SPHINXBUILD=sphinx-build-3 html
rm docs/_build/html/{.doctrees,.buildinfo} -vf
%install
-%py3_install
+%pyproject_install
+%pyproject_save_files pyphi
%check
%if %{with tests}
# Tests fails on s390x:
https://github.com/wmayner/pyphi/issues/41
# cannot use ifarch or %_arch or %_host_cpu: they're all related to build arch, which
is noarch here
-%if "%_target_cpu" == "s390x"
+%if "%_target_cpu" != "s390x"
%{pytest}
%endif
%endif
-%files -n python3-%{srcname}
-%license LICENSE.md
+%files -n python3-pyphi -f %{pyproject_files}
%doc README.md CHANGELOG.md CACHING.rst redis.conf
-%{python3_sitelib}/%{srcname}
-%{python3_sitelib}/%{srcname}-%{version}-py%{python3_version}.egg-info
%files doc
%license LICENSE.md
%doc docs/_build/html/
%changelog
+%autochangelog
+
* Wed Aug 18 2021 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 1.2.0-13
- Correctly disable tests on s390x
diff --git a/sources b/sources
index a0f4892..bf552d1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pyphi-1.2.0.tar.gz) =
520237261b500cd78e47d98e60d0e2b741ed314ddb3a7f9e60dc8c1ea758d673972bdb64f40f7e99784e0e3bedf93fdeb8dcf7c636dda788c80f0bc6940fa8c1
+SHA512 (pyphi-1.2.1.tar.gz) =
a33743db6114b98c01c65dfc57768f1f4c039791ef6570e3959b4b3483926d23e98bdf89781bf56ef17041dc4402ae07ea40cd368d6882290c45929ab34810ce
commit 1b489cdc14c47b1c6adf56d131267e8ca9f03c91
Author: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur(a)gmail.com>
Date: Wed Aug 18 20:39:41 2021 +0100
fix: correctly disable tests on s390x
diff --git a/python-pyphi.spec b/python-pyphi.spec
index a3833b8..a848bee 100644
--- a/python-pyphi.spec
+++ b/python-pyphi.spec
@@ -18,7 +18,7 @@ The manuscript is available at
https://arxiv.org/abs/1712.09644.}
Name: python-%{srcname}
Version: 1.2.0
-Release: 12%{?dist}
+Release: 13%{?dist}
Summary: A library for computing integrated information
License: GPLv3
@@ -86,8 +86,9 @@ rm docs/_build/html/{.doctrees,.buildinfo} -vf
%check
%if %{with tests}
# Tests fails on s390x:
https://github.com/wmayner/pyphi/issues/41
-%ifnarch s390x
-py.test-%{python3_version}
+# cannot use ifarch or %_arch or %_host_cpu: they're all related to build arch, which
is noarch here
+%if "%_target_cpu" == "s390x"
+%{pytest}
%endif
%endif
@@ -102,6 +103,9 @@ py.test-%{python3_version}
%doc docs/_build/html/
%changelog
+* Wed Aug 18 2021 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 1.2.0-13
+- Correctly disable tests on s390x
+
* Wed Aug 18 2021 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 1.2.0-12
- Fix build
commit 0695a7bf412f9ec92e744e6aeed2b5c83600a199
Author: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur(a)gmail.com>
Date: Wed Aug 18 19:39:45 2021 +0100
fix: add patch to fix build
Fixes
https://bugzilla.redhat.com/show_bug.cgi?id=1962452
diff --git a/0001-fix-py3.10-correct-collections-import.patch
b/0001-fix-py3.10-correct-collections-import.patch
new file mode 100644
index 0000000..4c35615
--- /dev/null
+++ b/0001-fix-py3.10-correct-collections-import.patch
@@ -0,0 +1,115 @@
+From adf06fdb2a5896ba07ac4438b307f0870b57427e Mon Sep 17 00:00:00 2001
+From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur(a)gmail.com>
+Date: Wed, 18 Aug 2021 19:23:27 +0100
+Subject: [PATCH] fix(py3.10) correct collections import
+
+---
+ pyphi/db.py | 5 ++++-
+ pyphi/labels.py | 2 +-
+ pyphi/models/actual_causation.py | 2 +-
+ pyphi/models/cmp.py | 5 ++++-
+ pyphi/models/cuts.py | 2 +-
+ pyphi/models/subsystem.py | 2 +-
+ pyphi/registry.py | 2 +-
+ 7 files changed, 13 insertions(+), 7 deletions(-)
+
+diff --git a/pyphi/db.py b/pyphi/db.py
+index f1df5d15..8352dfe8 100644
+--- a/pyphi/db.py
++++ b/pyphi/db.py
+@@ -7,7 +7,10 @@ Interface to MongoDB that exposes it as a key-value store.
+ """
+
+ import pickle
+-from collections import Iterable
++try:
++ from collections import Iterable
++except ImportError:
++ from collections.abc import Iterable
+
+ import pymongo
+ from bson.binary import Binary
+diff --git a/pyphi/labels.py b/pyphi/labels.py
+index 14400aef..800be2a6 100644
+--- a/pyphi/labels.py
++++ b/pyphi/labels.py
+@@ -22,7 +22,7 @@ def default_labels(indices):
+ return tuple(default_label(i) for i in indices)
+
+
+-class NodeLabels(collections.Sequence):
++class NodeLabels(collections.abc.Sequence):
+ '''Text labels for nodes in a network.
+
+ Labels can either be instantiated as a tuple of strings:
+diff --git a/pyphi/models/actual_causation.py b/pyphi/models/actual_causation.py
+index 08416baa..d1298b05 100644
+--- a/pyphi/models/actual_causation.py
++++ b/pyphi/models/actual_causation.py
+@@ -216,7 +216,7 @@ class Event(collections.namedtuple('Event',
['actual_cause', 'actual_effect'])):
+ return self.actual_cause.mechanism
+
+
+-class Account(cmp.Orderable, collections.Sequence):
++class Account(cmp.Orderable, collections.abc.Sequence):
+ """The set of |CausalLinks| with |alpha > 0|. This includes both
actual
+ causes and actual effects.
+ """
+diff --git a/pyphi/models/cmp.py b/pyphi/models/cmp.py
+index 5e475a7d..7b1d5f24 100644
+--- a/pyphi/models/cmp.py
++++ b/pyphi/models/cmp.py
+@@ -7,7 +7,10 @@ Utilities for comparing phi-objects.
+ """
+
+ import functools
+-from collections import Iterable
++try:
++ from collections import Iterable
++except ImportError:
++ from collections.abc import Iterable
+
+ import numpy as np
+
+diff --git a/pyphi/models/cuts.py b/pyphi/models/cuts.py
+index 7c461f9c..95cccd44 100644
+--- a/pyphi/models/cuts.py
++++ b/pyphi/models/cuts.py
+@@ -266,7 +266,7 @@ class Part(collections.namedtuple('Part',
['mechanism', 'purview'])):
+ return {'mechanism': self.mechanism, 'purview': self.purview}
+
+
+-class KPartition(collections.Sequence):
++class KPartition(collections.abc.Sequence):
+ """A partition with an arbitrary number of parts."""
+
+ __slots__ = ['parts', 'node_labels']
+diff --git a/pyphi/models/subsystem.py b/pyphi/models/subsystem.py
+index 15c48fe0..2fcecd23 100644
+--- a/pyphi/models/subsystem.py
++++ b/pyphi/models/subsystem.py
+@@ -17,7 +17,7 @@ def _concept_sort_key(concept):
+ return (len(concept.mechanism), concept.mechanism)
+
+
+-class CauseEffectStructure(cmp.Orderable, collections.Sequence):
++class CauseEffectStructure(cmp.Orderable, collections.abc.Sequence):
+ """A collection of concepts."""
+
+ def __init__(self, concepts=(), subsystem=None, time=None):
+diff --git a/pyphi/registry.py b/pyphi/registry.py
+index 94dda74b..cce8a4db 100644
+--- a/pyphi/registry.py
++++ b/pyphi/registry.py
+@@ -9,7 +9,7 @@ A function registry for storing custom measures and partition
strategies.
+ import collections
+
+
+-class Registry(collections.Mapping):
++class Registry(collections.abc.Mapping):
+ """Generic registry for user-supplied functions.
+
+ See ``pyphi.subsystem.PartitionRegistry`` and
+--
+2.31.1
+
diff --git a/python-pyphi.spec b/python-pyphi.spec
index 499be7d..a3833b8 100644
--- a/python-pyphi.spec
+++ b/python-pyphi.spec
@@ -18,7 +18,7 @@ The manuscript is available at
https://arxiv.org/abs/1712.09644.}
Name: python-%{srcname}
Version: 1.2.0
-Release: 11%{?dist}
+Release: 12%{?dist}
Summary: A library for computing integrated information
License: GPLv3
@@ -26,11 +26,15 @@ URL:
https://github.com/wmayner/%{srcname}/
Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
BuildArch: noarch
+#
https://github.com/wmayner/pyphi/pull/50
+Patch0: 0001-fix-py3.10-correct-collections-import.patch
+BuildRequires: git-core
+
%description %_description
%package -n python3-%{srcname}
Summary: %{summary}
-BuildRequires: make
+BuildRequires: make
BuildRequires: python3-devel
# To build docs, and run tests
BuildRequires: %{py3_dist asv}
@@ -52,8 +56,6 @@ BuildRequires: %{py3_dist tblib}
BuildRequires: %{py3_dist tqdm}
BuildRequires: %{py3_dist wheel}
-%{?python_provide:%python_provide python3-%{srcname}}
-
%description -n python3-%{srcname} %_description
%package doc
@@ -64,7 +66,7 @@ Documentation for %{name}
%prep
-%autosetup -n %{srcname}-%{version}
+%autosetup -n %{srcname}-%{version} -S git
# sphinx 1.3+, it's an extension
# Also sent upstream:
https://github.com/wmayner/pyphi/pull/22
@@ -100,6 +102,9 @@ py.test-%{python3_version}
%doc docs/_build/html/
%changelog
+* Wed Aug 18 2021 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 1.2.0-12
+- Fix build
+
* Fri Jul 23 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-11
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
commit a5e0d2d5dce8316247e5eeb57c8f993eed905a1d
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jul 23 08:43:58 2021 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/python-pyphi.spec b/python-pyphi.spec
index ed8993e..499be7d 100644
--- a/python-pyphi.spec
+++ b/python-pyphi.spec
@@ -18,7 +18,7 @@ The manuscript is available at
https://arxiv.org/abs/1712.09644.}
Name: python-%{srcname}
Version: 1.2.0
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: A library for computing integrated information
License: GPLv3
@@ -100,6 +100,9 @@ py.test-%{python3_version}
%doc docs/_build/html/
%changelog
+* Fri Jul 23 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-11
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
* Fri Jun 04 2021 Python Maint <python-maint(a)redhat.com> - 1.2.0-10
- Rebuilt for Python 3.10
commit b1c265ee122169e8b68ce8ed142b042f01123c43
Author: Python Maint <python-maint(a)redhat.com>
Date: Fri Jun 4 20:55:06 2021 +0200
Rebuilt for Python 3.10
diff --git a/python-pyphi.spec b/python-pyphi.spec
index e667731..ed8993e 100644
--- a/python-pyphi.spec
+++ b/python-pyphi.spec
@@ -18,7 +18,7 @@ The manuscript is available at
https://arxiv.org/abs/1712.09644.}
Name: python-%{srcname}
Version: 1.2.0
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: A library for computing integrated information
License: GPLv3
@@ -100,6 +100,9 @@ py.test-%{python3_version}
%doc docs/_build/html/
%changelog
+* Fri Jun 04 2021 Python Maint <python-maint(a)redhat.com> - 1.2.0-10
+- Rebuilt for Python 3.10
+
* Fri Jan 29 2021 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 1.2.0-9
- Update URL