diff --git a/_multibuild b/_multibuild deleted file mode 100644 index 1486389..0000000 --- a/_multibuild +++ /dev/null @@ -1,3 +0,0 @@ - - gnu-hpc - diff --git a/python-numpy1.changes b/python-numpy1.changes index 6daf329..0fb0ffe 100644 --- a/python-numpy1.changes +++ b/python-numpy1.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Mar 29 13:48:18 UTC 2025 - Nicolas Morey + +- Disable and remove support of gnu-hpc build flavours (bsc#1239982) + ------------------------------------------------------------------- Thu Mar 27 12:44:26 UTC 2025 - Ben Greiner diff --git a/python-numpy1.spec b/python-numpy1.spec index aa000b0..24b4d35 100644 --- a/python-numpy1.spec +++ b/python-numpy1.spec @@ -1,7 +1,7 @@ # # spec file for package python-numpy1 # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,43 +16,8 @@ # -%global flavor @BUILD_FLAVOR@%{nil} -%define ver 1.26.4 -%define _ver 1_26_4 %define plainpython python -%define hpc_upcase_trans_hyph() %(echo %{**} | tr [a-z] [A-Z] | tr '-' '_') -%if "%{flavor}" == "" - %bcond_with hpc - %bcond_with openblas -%endif -%if "%{flavor}" == "gnu-hpc" - %bcond_without hpc -%endif -%if "%{flavor}" == "gnu7-hpc" - %define c_f_ver 7 - %bcond_without hpc -%endif -%if %{with hpc} -%if 0%{?suse_version} > 1500 -# All hpc packages are slated for removal from factory and SLFO/Leap 16: boo#1239982 -# Once this is accepted by the community, the whole hpc code in this specfile and -# the multibuild can be cleaned up -ExclusiveArch: do_not_build -%endif - %bcond_without openblas -%endif -%if %{without hpc} -%define pname python-numpy1 -%else -%define pname python-numpy -%endif - -%if 0%{?sle_version} == 120300 -%{?with_openblas:ExclusiveArch: do_not_build} -%endif -%{?with_hpc:%{hpc_requires}} -# %if 0%{?suse_version} > 1500 %bcond_without libalternatives %bcond_without cblas @@ -61,30 +26,10 @@ ExclusiveArch: do_not_build %bcond_with cblas %endif # -%bcond_with ringdisabled -# -%if %{without hpc} -%define package_name %{pname} -%define p_python_sitearch %{python_sitearch} -%define p_prefix %{_prefix} -%define p_bindir %{_bindir} -%else -%{!?compiler_family:%global compiler_family gnu} -%{hpc_init -c %{compiler_family} %{?c_f_ver:-v %{c_f_ver}} %{?mpi_ver:-V %{mpi_ver}}} -%define package_name %{hpc_package_name %{_ver}} -%define p_python_sitearch %{hpc_python_sitearch} -%define p_prefix %{hpc_prefix} -%define p_bindir %{hpc_bindir} -# Magic for OBS Staging. Only build the flavors required by -# other packages in the ring. -%if %{with ringdisabled} -ExclusiveArch: do_not_build -%endif -%endif %{?sle15_python_module_pythons} -Name: %{package_name} -# set %%ver and %%_ver instead above -Version: %{ver} + +Name: python-numpy1 +Version: 1.26.4 Release: 0 Summary: NumPy array processing for numbers, strings, records and objects License: BSD-3-Clause @@ -129,7 +74,6 @@ BuildRequires: %{python_module pytest-xdist} BuildRequires: %{python_module testsuite} BuildRequires: %{python_module typing-extensions >= 4.2.0} # /SECTION -%if %{without hpc} # Last version which packaged %%{_bindir}/f2py without update-alternatives Conflicts: %{plainpython}-numpy <= 1.12.0 Conflicts: python-numpy >= 2 @@ -139,9 +83,6 @@ BuildRequires: gcc-fortran %else BuildRequires: gcc-gfortran %endif -%if %{with openblas} -BuildRequires: openblas-devel > 0.3.20 -%else BuildRequires: blas-devel BuildRequires: lapack-devel %if %{with cblas} @@ -149,7 +90,6 @@ BuildRequires: lapack-devel BuildRequires: cblas-devel Recommends: libopenblas_pthreads0 %endif -%endif %if %{with libalternatives} BuildRequires: alts Requires: alts @@ -157,19 +97,8 @@ Requires: alts Requires(post): update-alternatives Requires(postun): update-alternatives %endif -%else -BuildRequires: %{compiler_family}%{?c_f_ver}-compilers-hpc-macros-devel -BuildRequires: libopenblas%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc-devel -%ifnarch %ix86 %arm -BuildRequires: lua-lmod -%endif -BuildRequires: suse-hpc -Requires: libopenblas%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc -%endif %python_subpackages -# Note: the hpc master package is provided by numpy 2 only - %description NumPy is a general-purpose array-processing package designed to efficiently manipulate large multi-dimensional arrays of arbitrary @@ -187,22 +116,13 @@ Summary: Development files for numpy applications Requires: %{name} = %{version} Requires: python-devel Requires: %plainpython(abi) = %{python_version} -%if %{without hpc} Conflicts: python-numpy-devel >= 2 Provides: python-numpy-devel = %{version}-%{release} -%if %{with openblas} -Requires: openblas-devel -%else Requires: blas-devel %if %{with cblas} Requires: cblas-devel %endif Requires: lapack-devel -%endif -%else -Requires: libopenblas%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc-devel -%{hpc_requires_devel} -%endif %description devel This package contains files for developing applications using numpy. @@ -225,19 +145,7 @@ rm -f PKG-INFO %build %define _lto_cflags %{nil} -%if %{with hpc} -%hpc_setup -module load openblas -export CFLAGS="$(pkg-config --cflags openblas) %{optflags} -fno-strict-aliasing" LIBS="$(pkg-config --libs openblas)" -cat > site.cfg <