From 5534efc29797e6170e4d7cce474d3663c852b4b2 Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Mar 17 2019 19:08:57 +0000 Subject: Subpackages python2-mpi4py, python2-mpi4py-openmpi have been removed --- diff --git a/mpi4py.spec b/mpi4py.spec index e03641b..f37d58a 100644 --- a/mpi4py.spec +++ b/mpi4py.spec @@ -5,7 +5,6 @@ %endif %endif -%global with_python3 1 ### TESTSUITE ### # The testsuite currently fails only on the buildsystem, but works localy. @@ -31,7 +30,7 @@ Name: mpi4py Version: 3.0.1 -Release: 1%{?commit:.git%{shortcommit}}%{?dist} +Release: 2%{?commit:.git%{shortcommit}}%{?dist} Summary: Python bindings of the Message Passing Interface (MPI) License: BSD @@ -45,12 +44,8 @@ Source0: https://bitbucket.org/mpi4py/mpi4py/downloads/mpi4py-%{version}. # See also #1105902. Patch1: mpi4py-2.0.0-openmpi-threading.patch -BuildRequires: python2-devel -BuildRequires: python2-Cython >= 0.22 -%if 0%{?with_python3} BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-Cython >= 0.22 -%endif %description @@ -62,19 +57,6 @@ object as well as optimized communications of Python object exposing the single-segment buffer interface (NumPy arrays, built-in bytes/string/array objects). -%package -n python2-mpi4py -Requires: %{name}-common = %{version}-%{release} -Summary: Python 2 bindings of the Message Passing Interface (MPI) -%{?python_provide:%python_provide python2-mpi4py} -%description -n python2-mpi4py -This package is constructed on top of the MPI-1/MPI-2 specification and -provides an object oriented interface which closely follows MPI-2 C++ -bindings. It supports point-to-point (sends, receives) and collective -(broadcasts, scatters, gathers) communications of any picklable Python -object as well as optimized communications of Python object exposing the -single-segment buffer interface (NumPy arrays, built-in bytes/string/array -objects). - %package docs Summary: Documentation for %{name} Requires: %{name}-common = %{version}-%{release} @@ -82,7 +64,6 @@ BuildArch: noarch %description docs This package contains the documentation and examples for %{name}. -%if 0%{?with_python3} %package -n python%{python3_pkgversion}-mpi4py Requires: %{name}-common = %{version}-%{release} Summary: Python %{python3_version} bindings of the Message Passing Interface (MPI) @@ -136,7 +117,6 @@ objects). This package contains %{name} compiled against MPICH. %endif -%endif # with_python3 %package common Summary: Common files for mpi4py packages @@ -145,52 +125,6 @@ Requires: %{name}-common = %{version}-%{release} %description common This package contains the license file shard between the subpackages of %{name}. -%package -n python2-mpi4py-openmpi -BuildRequires: openmpi-devel -Requires: %{name}-common = %{version}-%{release} -Requires: python2-openmpi%{?_isa} -Summary: Python 2 bindings of MPI, Open MPI version -Provides: mpi4py-runtime = %{version}-%{release} -# Old mpi4py-foo provides added at F24 -Provides: mpi4py-openmpi = %{version}-%{release} -Obsoletes: mpi4py-openmpi < 1.3.1-16 -%{?python_provide:%python_provide python2-mpi4py-openmpi} -%description -n python2-mpi4py-openmpi -This package is constructed on top of the MPI-1/MPI-2 specification and -provides an object oriented interface which closely follows MPI-2 C++ -bindings. It supports point-to-point (sends, receives) and collective -(broadcasts, scatters, gathers) communications of any picklable Python -object as well as optimized communications of Python object exposing the -single-segment buffer interface (NumPy arrays, built-in bytes/string/array -objects). - -This package contains %{name} compiled against Open MPI. - - -%if %{with_mpich} -%package -n python2-mpi4py-mpich -BuildRequires: mpich-devel -Requires: %{name}-common = %{version}-%{release} -Requires: python2-mpich%{?_isa} -Summary: Python 2 bindings of MPI, MPICH version -Provides: mpi4py-runtime = %{version}-%{release} -Provides: %{name}-mpich2 = %{version}-%{release} -Obsoletes: %{name}-mpich2 < 1.3-8 -Provides: mpi4py-mpich = %{version}-%{release} -Obsoletes: mpi4py-mpich < 1.3.1-16 -%{?python_provide:%python_provide python2-mpi4py-mpich} -%description -n python2-mpi4py-mpich -This package is constructed on top of the MPI-1/MPI-2 specification and -provides an object oriented interface which closely follows MPI-2 C++ -bindings. It supports point-to-point (sends, receives) and collective -(broadcasts, scatters, gathers) communications of any picklable Python -object as well as optimized communications of Python object exposing the -single-segment buffer interface (NumPy arrays, built-in bytes/string/array -objects). - -This package contains %{name} compiled against MPICH. -%endif - %prep %setup -q %{?commit:-n %{name}-%{name}-%{shortcommit}} @@ -217,28 +151,6 @@ export CXX=mpicxx # Build OpenMPI version %{_openmpi_load} cp .__init__openmpi.py src/mpi4py/__init__.py -%py2_build -mv build openmpi -%{_openmpi_unload} - -%if %{with_mpich} -# Build mpich version -%{_mpich_load} -cp .__init__mpich.py src/mpi4py/__init__.py -%py2_build -mv build mpich -%{_mpich_unload} -%endif - -%if 0%{?with_python3} -# Build parallel versions: set compiler variables to MPI wrappers -export CC=mpicc -export CXX=mpicxx - -# Build OpenMPI version -%{_openmpi_load} -cp .__init__openmpi.py src/mpi4py/__init__.py -mv openmpi build %py3_build mv build openmpi %{_openmpi_unload} @@ -247,13 +159,11 @@ mv build openmpi # Build mpich version %{_mpich_load} cp .__init__mpich.py src/mpi4py/__init__.py -mv mpich build %py3_build mv build mpich %{_mpich_unload} %endif -%endif %install @@ -261,30 +171,6 @@ mv build mpich %{_openmpi_load} cp .__init__openmpi.py src/mpi4py/__init__.py mv openmpi build -%py2_install -mkdir -p %{buildroot}%{python2_sitearch}/openmpi -mv %{buildroot}%{python2_sitearch}/%{name}/ %{buildroot}%{python2_sitearch}/%{name}*.egg-info %{buildroot}%{python2_sitearch}/openmpi -mv build openmpi -%{_openmpi_unload} - -%if %{with_mpich} -# Install MPICH version -%{_mpich_load} -cp .__init__mpich.py src/mpi4py/__init__.py -mv mpich build -%py2_install -mkdir -p %{buildroot}%{python2_sitearch}/mpich -mv %{buildroot}%{python2_sitearch}/%{name}/ %{buildroot}%{python2_sitearch}/%{name}*.egg-info %{buildroot}%{python2_sitearch}/mpich -mv build mpich -%{_mpich_unload} -%endif - - -%if 0%{?with_python3} -# Install OpenMPI version -%{_openmpi_load} -cp .__init__openmpi.py src/mpi4py/__init__.py -mv openmpi build %py3_install mkdir -p %{buildroot}%{python3_sitearch}/openmpi mv %{buildroot}%{python3_sitearch}/%{name}/ %{buildroot}%{python3_sitearch}/%{name}*.egg-info %{buildroot}%{python3_sitearch}/openmpi @@ -303,7 +189,6 @@ mv build mpich %{_mpich_unload} %endif -%endif %check @@ -312,43 +197,6 @@ mv build mpich %{_openmpi_load} cp .__init__openmpi.py src/mpi4py/__init__.py mv openmpi build -PYTHONPATH=%{buildroot}%{python2_sitearch}/openmpi \ - mpiexec -n 1 python2 test/runtests.py -v --no-builddir --thread-level=serialized -e spawn -%if 0%{?FULLTESTS} -PYTHONPATH=%{buildroot}%{python2_sitearch}/openmpi \ - mpiexec -n 5 python2 test/runtests.py -v --no-builddir -e spawn -PYTHONPATH=%{buildroot}%{python2_sitearch}/openmpi \ - mpiexec -n 8 python2 test/runtests.py -v --no-builddir -e spawn -%endif -mv build openmpi -%{_openmpi_unload} -%endif - -# test mpich? -%if 0%{?MPICH} -%if %{with_mpich} -%{_mpich_load} -cp .__init__mpich.py src/mpi4py/__init__.py -mv mpich build -PYTHONPATH=%{buildroot}%{python2_sitearch}/mpich \ - mpiexec -n 1 python2 test/runtests.py -v --no-builddir -e spawn -%if 0%{?FULLTESTS} -PYTHONPATH=%{buildroot}%{python2_sitearch}/mpich \ - mpiexec -n 5 python2 test/runtests.py -v --no-builddir -e spawn -PYTHONPATH=%{buildroot}%{python2_sitearch}/mpich \ - mpiexec -n 8 python2 test/runtests.py -v --no-builddir -e spawn -%endif -mv build mpich -%{_mpich_unload} -%endif -%endif - -%if 0%{?with_python3} -# test openmpi? -%if 0%{?OPENMPI} -%{_openmpi_load} -cp .__init__openmpi.py src/mpi4py/__init__.py -mv openmpi build PYTHONPATH=%{buildroot}%{python3_sitearch}/openmpi \ mpiexec -np 1 python3 test/runtests.py -v --no-builddir --thread-level=serialized -e spawn %if 0%{?FULLTESTS} @@ -379,24 +227,12 @@ mv build mpich %{_mpich_unload} %endif %endif # mpich disable -%endif # with_python3 %files common %license LICENSE.rst %doc CHANGES.rst DESCRIPTION.rst README.rst -%files -n python2-mpi4py-openmpi -%{python2_sitearch}/openmpi/%{name}-*.egg-info -%{python2_sitearch}/openmpi/%{name} - -%if %{with_mpich} -%files -n python2-mpi4py-mpich -%{python2_sitearch}/mpich/%{name}-*.egg-info -%{python2_sitearch}/mpich/%{name} -%endif - -%if 0%{?with_python3} %files -n python%{python3_pkgversion}-mpi4py-openmpi %{python3_sitearch}/openmpi/%{name}-*.egg-info %{python3_sitearch}/openmpi/%{name} @@ -406,13 +242,16 @@ mv build mpich %{python3_sitearch}/mpich/%{name}-*.egg-info %{python3_sitearch}/mpich/%{name} %endif -%endif # with_python3 %files docs %doc docs/* demo %changelog +* Sun Mar 17 2019 Miro Hrončok - 3.0.1-2 +- Subpackages python2-mpi4py, python2-mpi4py-openmpi have been removed + See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal + * Sat Feb 16 2019 Zbigniew Jędrzejewski-Szmek - 3.0.1-1 - Update to latest bugfix version (#1677683)