The package rpms/python-fslpy.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-fslpy.git/commit/?id=bc4b6....
Change:
+ExcludeArch: %{ix86}
Thanks.
Full change:
============
commit dfbb2de6dd40a8b07db93ee09ac195f9018c6272
Author: Packit <hello(a)packit.dev>
Date: Thu Jan 18 09:05:16 2024 +0000
[packit] 3.16.1 upstream release
- Resolves rhbz#2258961
Upstream tag: 3.16.1
Upstream commit: 9b5cf530
diff --git a/.gitignore b/.gitignore
index 2987580..6c9ae63 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@
/fslpy-3.13.3.tar.gz
/fslpy-3.15.2.tar.gz
/fslpy-3.16.0.tar.gz
+/fslpy-3.16.1.tar.gz
diff --git a/README.packit b/README.packit
index 3aa26d6..115b422 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,3 @@
This repository is maintained by packit.
https://packit.dev/
-The file was generated using packit 0.87.1.post1.dev9+ge52a00d1.
+The file was generated using packit 0.88.0.post1.dev4+gc070191b.
diff --git a/python-fslpy.spec b/python-fslpy.spec
index fc737e3..6593ca2 100644
--- a/python-fslpy.spec
+++ b/python-fslpy.spec
@@ -8,7 +8,7 @@ FSLeyes.
%global forgeurl
https://github.com/pauldmccarthy/fslpy
Name: python-fslpy
-Version: 3.16.0
+Version: 3.16.1
Release: %autorelease
Summary: The FSL Python Library
diff --git a/sources b/sources
index 7b8cb19..00498de 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fslpy-3.16.0.tar.gz) =
243ae207d939be330ac8d7a9ae74f62d5c38cfc8c0811269f6969f35aa997248a6953f3bb99620f1a273e265e26c675091d14a7df6a3ff303aab5753b0c66698
+SHA512 (fslpy-3.16.1.tar.gz) =
46469657203fd2c1d84b5c9c14ad0279f7780d94b34fcf7b729b0794b38f4bcc0410bb7d01eb6b164f330ded3de0f0b91c76d15db134f62153e7ec91e1236ad0
commit 62c7be5a4c50dee631ef195b98f4c0ba1bf7c3e6
Author: Packit <hello(a)packit.dev>
Date: Thu Dec 21 00:20:55 2023 +0000
[packit] 3.16.0 upstream release
- Resolves rhbz#2250059
Upstream tag: 3.16.0
Upstream commit: 23d78618
diff --git a/.gitignore b/.gitignore
index e53dc2b..2987580 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@
/fslpy-3.12.1.tar.gz
/fslpy-3.13.3.tar.gz
/fslpy-3.15.2.tar.gz
+/fslpy-3.16.0.tar.gz
diff --git a/README.packit b/README.packit
new file mode 100644
index 0000000..3aa26d6
--- /dev/null
+++ b/README.packit
@@ -0,0 +1,3 @@
+This repository is maintained by packit.
+https://packit.dev/
+The file was generated using packit 0.87.1.post1.dev9+ge52a00d1.
diff --git a/python-fslpy.spec b/python-fslpy.spec
index fc2adff..fc737e3 100644
--- a/python-fslpy.spec
+++ b/python-fslpy.spec
@@ -8,7 +8,7 @@ FSLeyes.
%global forgeurl
https://github.com/pauldmccarthy/fslpy
Name: python-fslpy
-Version: 3.15.2
+Version: 3.16.0
Release: %autorelease
Summary: The FSL Python Library
diff --git a/sources b/sources
index c33177f..7b8cb19 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fslpy-3.15.2.tar.gz) =
d60256c0edb925a5dd83c302755d5a0ebd205b6f8b8abd47a12d2a3a0a1f778387272faa191c21ec2d22ee1d443222eb2f00eee6c6ffe5c9c7e48da18fe2ad38
+SHA512 (fslpy-3.16.0.tar.gz) =
243ae207d939be330ac8d7a9ae74f62d5c38cfc8c0811269f6969f35aa997248a6953f3bb99620f1a273e265e26c675091d14a7df6a3ff303aab5753b0c66698
commit 14913eb09863bd5a80ee637f422327a8094c553b
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Mon Dec 4 09:28:58 2023 -0500
Remove unnecessary upstream_tag_template from packit config
Fixes invalid packit config (since the unquoted template looked like a
dictionary to the YAML parser).
[skip changelog]
diff --git a/.packit.yaml b/.packit.yaml
index 40237de..8f00918 100644
--- a/.packit.yaml
+++ b/.packit.yaml
@@ -1,6 +1,5 @@
upstream_project_url:
https://github.com/pauldmccarthy/fslpy
copy_upstream_release_description: false
-upstream_tag_template: {version}
jobs:
- job: pull_from_upstream
commit bc4b66f0e0634184c966803ddfa40badcc7ddfb7
Author: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur(a)gmail.com>
Date: Wed Oct 25 12:43:10 2023 +0100
fix: drop i686, add extras package, remove test files (fixes rh#2236184)
diff --git a/python-fslpy.spec b/python-fslpy.spec
index 0fe6f8c..fc2adff 100644
--- a/python-fslpy.spec
+++ b/python-fslpy.spec
@@ -22,6 +22,10 @@ URL: %forgeurl
Source0: %forgesource
BuildArch: noarch
+# fsleyes dropped it already, so this is a leaf package
+# F40+
+ExcludeArch: %{ix86}
+
BuildRequires: python3-devel
BuildRequires: help2man
@@ -41,6 +45,7 @@ Summary: %{summary}
%description -n python3-fslpy
%{desc}
+%pyproject_extras_subpkg -n python3-fslpy extra
%prep
%forgesetup
@@ -68,7 +73,8 @@ find . -type f -name "*.py" -exec sed -i 's/#![
]*\/usr\/bin\/env python$/#!\/u
%pyproject_save_files fsl
# Remove test packages that are installed in site packages
-rm -rfv %{buildroot}/%{python3_sitelib}/tests/
+rm -rvf %{buildroot}%{python3_sitelib}/fsl/tests
+sed -r -i '/\bfsl\/tests\b/d' %{pyproject_files}
# generate man pages
# imglob does not have a --help
commit fae691c0a69173279ad4f2852a1da8c1116c0d12
Author: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur(a)gmail.com>
Date: Wed Oct 25 11:38:12 2023 +0100
feat: update to 3.15.2 (fixes rh#2236184)
diff --git a/.gitignore b/.gitignore
index 5bfc93e..e53dc2b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@
/fslpy-3.11.1.tar.gz
/fslpy-3.12.1.tar.gz
/fslpy-3.13.3.tar.gz
+/fslpy-3.15.2.tar.gz
diff --git a/python-fslpy.spec b/python-fslpy.spec
index 11b9d19..0fe6f8c 100644
--- a/python-fslpy.spec
+++ b/python-fslpy.spec
@@ -5,17 +5,21 @@
The fslpy project is a FSL programming library written in Python. It is used by \
FSLeyes.
+%global forgeurl
https://github.com/pauldmccarthy/fslpy
+
Name: python-fslpy
-Version: 3.13.3
+Version: 3.15.2
Release: %autorelease
Summary: The FSL Python Library
+%global tag %{version}
-License: Apache-2.0
-URL:
https://pypi.python.org/pypi/fslpy
-Source0: %{pypi_source fslpy}
+%forgemeta
-BuildRequires: git-core
+
+License: Apache-2.0
+URL: %forgeurl
+Source0: %forgesource
BuildArch: noarch
BuildRequires: python3-devel
@@ -23,7 +27,6 @@ BuildRequires: help2man
BuildRequires: dcm2niix
BuildRequires: %{py3_dist pytest}
-BuildRequires: %{py3_dist pytest-cov}
%if %{with xvfb_tests}
BuildRequires: xorg-x11-server-Xvfb
%endif
@@ -40,10 +43,13 @@ Summary: %{summary}
%prep
-%autosetup -n fslpy-%{version} -S git
+%forgesetup
-# For the dep generator to pick up
-cat requirements-extra.txt >> requirements.txt
+# remove pytest coverage etc bits
+sed -i -e '/"coverage"/ d' \
+ -e '/"pytest-cov"/ d' \
+ -e '/addopts/ d' \
+ pyproject.toml
# remove unneeded shebangs
find . -type f -name "*.py" -exec sed -i '/^#![ ]*\/usr\/bin\/env python$/
d' {} 2>/dev/null ';'
@@ -52,7 +58,7 @@ sed -i '/^#![ ]*\/usr\/bin\/env python3$/ d'
fsl/wrappers/tbss.py
find . -type f -name "*.py" -exec sed -i 's/#![ ]*\/usr\/bin\/env
python$/#!\/usr\/bin\/python3/' {} 2>/dev/null ';'
%generate_buildrequires
-%pyproject_buildrequires -r
+%pyproject_buildrequires -x extra -x test
%build
%pyproject_wheel
@@ -120,17 +126,21 @@ k="${k} and not test_VoxelwiseEVs"
k="${k} and not test_imcp_shouldPass"
k="${k} and not test_immv_shouldPass"
k="${k} and not test_fileOrThing_chained_outprefix"
-%{pytest} tests -k "${k}" \
- --ignore=tests/test_idle.py --ignore=tests/test_platform.py \
- --ignore=tests/test_atlases.py \
- --ignore=tests/test_atlases_query.py \
- --ignore=tests/test_scripts/test_atlasq_list_summary.py \
- --ignore=tests/test_scripts/test_atlasq_ohi.py \
- --ignore=tests/test_scripts/test_atlasq_query.py \
- --ignore=tests/test_dicom.py \
- --ignore=tests/test_scripts/test_fsl_apply_x5.py \
- --ignore=tests/test_scripts/test_fsl_convert_x5.py \
- --ignore=tests/test_scripts/test_immv_imcp.py
+# requires an FSL installation
+k="${k} and not test_cluster"
+# unable to find tests module
+k="${k} and not test_func_to_cmd"
+%{pytest} fsl/tests -k "${k}" \
+ --ignore=fsl/tests/test_idle.py --ignore=fsl/tests/test_platform.py \
+ --ignore=fsl/tests/test_atlases.py \
+ --ignore=fsl/tests/test_atlases_query.py \
+ --ignore=fsl/tests/test_scripts/test_atlasq_list_summary.py \
+ --ignore=fsl/tests/test_scripts/test_atlasq_ohi.py \
+ --ignore=fsl/tests/test_scripts/test_atlasq_query.py \
+ --ignore=fsl/tests/test_dicom.py \
+ --ignore=fsl/tests/test_scripts/test_fsl_apply_x5.py \
+ --ignore=fsl/tests/test_scripts/test_fsl_convert_x5.py \
+ --ignore=fsl/tests/test_scripts/test_immv_imcp.py
%files -n python3-fslpy -f %{pyproject_files}
%doc README.rst
diff --git a/sources b/sources
index aff19a9..c33177f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fslpy-3.13.3.tar.gz) =
2cc1d565e57becc9e8773dc5b4b93ab379c84ecbc57dce6bc70c5d760c47ac4d84a497ce11298e9949bb0e5920f7c0ee9a9dfeb9b67ca275b1c8609cd3af3653
+SHA512 (fslpy-3.15.2.tar.gz) =
d60256c0edb925a5dd83c302755d5a0ebd205b6f8b8abd47a12d2a3a0a1f778387272faa191c21ec2d22ee1d443222eb2f00eee6c6ffe5c9c7e48da18fe2ad38
commit 7770baaf207d6bead572710d135e2965f7ffbb6f
Author: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur(a)gmail.com>
Date: Wed Oct 25 11:02:44 2023 +0100
chore: add packit
diff --git a/.packit.yaml b/.packit.yaml
new file mode 100644
index 0000000..40237de
--- /dev/null
+++ b/.packit.yaml
@@ -0,0 +1,13 @@
+upstream_project_url:
https://github.com/pauldmccarthy/fslpy
+copy_upstream_release_description: false
+upstream_tag_template: {version}
+
+jobs:
+ - job: pull_from_upstream
+ trigger: release
+ dist_git_branches:
+ - fedora-rawhide
+ - job: koji_build
+ trigger: commit
+ dist_git_branches:
+ - fedora-all