The package rpms/python-nilearn.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-nilearn.git/commit/?id=d894f8....
Change: +%ifarch x86_64
Thanks.
Full change: ============
commit d894f86abe7e0e2f043f43073df1996d3b60faf9 Author: Packit hello@packit.dev Date: Mon Dec 2 15:00:15 2024 +0000
Update to 0.11.0 upstream release
- Resolves: rhbz#2329939
Upstream tag: 0.11.0 Upstream commit: 04be71fa
Commit authored by Packit automation (https://packit.dev/)
diff --git a/.gitignore b/.gitignore index 77790ec..c8df5c8 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /nilearn-0.10.2.tar.gz /nilearn-0.10.3.tar.gz /nilearn-0.10.4.tar.gz +/nilearn-0.11.0.tar.gz diff --git a/4857.patch b/4857.patch new file mode 100644 index 0000000..c17e057 --- /dev/null +++ b/4857.patch @@ -0,0 +1,23 @@ +From b780252a169ead0abbb3ae75da425977e023e20f Mon Sep 17 00:00:00 2001 +From: Himanshu Aggarwal himanshuaggarwal1997@gmail.com +Date: Mon, 2 Dec 2024 21:55:17 +0100 +Subject: [PATCH] datatype None case + +--- + nilearn/surface/surface.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/nilearn/surface/surface.py b/nilearn/surface/surface.py +index 52165bf278..4c5581b9e1 100644 +--- a/nilearn/surface/surface.py ++++ b/nilearn/surface/surface.py +@@ -1558,7 +1558,8 @@ def _data_to_gifti(data, gifti_file): + datatype = "NIFTI_TYPE_INT32" + elif data.dtype == np.float32: + datatype = "NIFTI_TYPE_FLOAT32" +- ++ else: ++ datatype = None + darray = gifti.GiftiDataArray(data=data, datatype=datatype) + + gii = gifti.GiftiImage(darrays=[darray]) diff --git a/README.packit b/README.packit index 60cc823..13501e1 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.94.2. +The file was generated using packit 0.104.1.post1.dev2+g8a1a06eb. diff --git a/python-nilearn.spec b/python-nilearn.spec index 885f71d..e86c04c 100644 --- a/python-nilearn.spec +++ b/python-nilearn.spec @@ -20,7 +20,7 @@ Detailed documentation is available at http://nilearn.github.io/.%7D %global forgeurl https://github.com/nilearn/nilearn
Name: python-nilearn -Version: 0.10.4 +Version: 0.11.0 Release: %autorelease Summary: Python module for fast and easy statistical learning on NeuroImaging data
@@ -31,9 +31,18 @@ Summary: Python module for fast and easy statistical learning on NeuroIma License: BSD-3-Clause URL: %forgeurl # Use GitHub tar: pypi does not include all test data -Source0: %forgesource - -# Since F40, python-scikit-learn is ExcludeArch: %%{ix86} +Source: %forgesource + +# [FIX] Save gifti with datatype None +# https://github.com/nilearn/nilearn/pull/4857 +# +# Fixes: +# +# [BUG] Some new test failures on s390x (big-endian) in 0.11.0 +# https://github.com/nilearn/nilearn/issues/4855 +Patch: %{forgeurl}/pull/4857.patch + +# python-scikit-learn is ExcludeArch: %%{ix86} ExcludeArch: %{ix86}
BuildRequires: python3-devel @@ -59,7 +68,7 @@ BuildArch: noarch %{desc}
%prep -%forgesetup +%forgeautosetup -p1 export SETUPTOOLS_SCM_PRETEND_VERSION='%{version}'
# Remove shebangs @@ -71,6 +80,9 @@ find . -name "*pyc" -exec rm -f '{}' ; sed -i 's/python/python3/' nilearn/plotting/html_document.py #sed -i 's/python/python3/' nilearn/plotting/glass_brain_files/generate_json.sh
+# Remove pytest-reporter-html1 arguments +sed -r -i 's/--template=[^[:blank:]"]+//' pyproject.toml + %generate_buildrequires export SETUPTOOLS_SCM_PRETEND_VERSION='%{version}' %pyproject_buildrequires -r @@ -83,24 +95,18 @@ export SETUPTOOLS_SCM_PRETEND_VERSION='%{version}' # generate it. We include the link to the documentation in the description.
%install -export SETUPTOOLS_SCM_PRETEND_VERSION='%{version}' %pyproject_install %pyproject_save_files -l nilearn
%check - -%ifarch s390x %{power64} %{arm64} -# https://github.com/nilearn/nilearn/issues/3232 -k="${k:-}${k:+ and} not test_load_confounds" - -k="${k:-}${k:+ and} not test_tfce_smoke" +%ifarch x86_64 +# [BUG] test_canica_square_img fails on some x86_64 machines +# https://github.com/nilearn/nilearn/issues/4876 +k="${k-}${k+ and }not test_canica_square_img" %endif
-# Fails with obscure error: -# _flapack.error: (liwork>=max(1,10*n)||liwork==-1) failed for 10th keyword liwork: dsyevr:liwork=1 -k="${k:-}${k:+ and} not test_percentile_range" # Requires kaleido (not available in Fedora) -k="${k:-}${k:+ and} not test_plot_surf[plotly]" +k="${k-}${k+ and }not test_plot_surf[plotly]" %{pytest} -v -k "${k:-}" nilearn
%files -n python3-nilearn -f %{pyproject_files} diff --git a/sources b/sources index 39874f0..7812ace 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nilearn-0.10.4.tar.gz) = 0cc16eded7ff9d1a26bdfff4b4cb09508c6445e5ef60dfbb6cdd8037439afe392df8ce59a7911b0de6e475741418f1de8c61d942e2acdd9b73e00f6285cf3fdf +SHA512 (nilearn-0.11.0.tar.gz) = 98dd40ab73c7401695578feb8309eef74d4a1862e9ec6038661d23dd8bfa0af70d4a09469a65d9c2be2d77c49cad5af500858e82ffba1beee24e951c6396a96f
arch-excludes@lists.fedoraproject.org