[mpi4py/f16: 2/2] - update to 1.3 - filter provides in pythonsitearch - run tests differently

[tomspur]

commit e246dd17a3c0fbd678ea8a3dca78c51d79776eb9
Author: Thomas Spura <thomas.spura at gmail.com>
Date:   Sat Jan 21 00:14:26 2012 +0100

    - update to 1.3
    - filter provides in pythonsitearch
    - run tests differently

 .gitignore  |    1 +
 mpi4py.spec |   75 +++++++++++++++++++++++++++++++++++++++++++---------------
 sources     |    2 +-
 3 files changed, 57 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4cc68c9..9b235fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 mpi4py-1.2.1.tar.gz
 /mpi4py-1.2.2.tar.gz
+/mpi4py-1.3.tar.gz
diff --git a/mpi4py.spec b/mpi4py.spec
index e59f0a8..5dd5168 100644
--- a/mpi4py.spec
+++ b/mpi4py.spec
@@ -3,6 +3,15 @@
 %endif
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%global python3_version %(%{__python3} -c "import sys; sys.stdout.write(sys.version[:3])")
+
+%{?filter_setup:
+%filter_provides_in %{python_sitearch}.*\.so$
+%if 0%{?fedora} > 12 || 0%{?rhel} > 6
+%filter_provides_in %{python3_sitearch}.*\.so$
+%endif
+%filter_setup
+}
 
 ### TESTSUITE ###
 # The testsuite currently fails only on the buildsystem, but works localy.
@@ -15,8 +24,8 @@
 %global OPENMPI 0
 
 Name:           mpi4py
-Version:        1.2.2
-Release:        7%{?dist}
+Version:        1.3
+Release:        1%{?dist}
 Summary:        Python bindings of the Message Passing Interface (MPI)
 
 Group:          Development/Languages
@@ -156,6 +165,11 @@ This package contains %{name} compiled against MPICH2.
 # this is just needed to generate docs/*
 rm -r docs/source
 
+# work around "wrong-file-end-of-line-encoding"
+for file in $(find | grep runtests.bat); do
+    sed -i 's/\r//' $file
+done
+
 %if 0%{?with_python3}
 rm -rf %{py3dir}
 cp -a . %{py3dir}
@@ -251,7 +265,11 @@ popd
 %if 0%{?OPENMPI}
 %{_openmpi_load}
 PYTHONPATH=%{buildroot}%{python_sitearch}/openmpi \
-    python test/runalltest.py
+    mpiexec -np 1 python2 test/runtests.py
+PYTHONPATH=%{buildroot}%{python_sitearch}/openmpi \
+    mpiexec -np 5 python2 test/runtests.py
+PYTHONPATH=%{buildroot}%{python_sitearch}/openmpi \
+    mpiexec -np 8 python2 test/runtests.py
 %{_openmpi_unload}
 %endif
 
@@ -260,18 +278,22 @@ PYTHONPATH=%{buildroot}%{python_sitearch}/openmpi \
 %{_mpich2_load}
 
 # create mpd.conf
-export MPD_CONF_FILE=mpd.conf
-echo MPD_SECRETWORD=$(pwgen -s 50 1) > mpd.conf
-chmod 600 mpd.conf
+#export MPD_CONF_FILE=mpd.conf
+#echo MPD_SECRETWORD=$(pwgen -s 50 1) > mpd.conf
+#chmod 600 mpd.conf
 
-mpd --daemon
+#mpd --daemon
+PYTHONPATH=%{buildroot}%{python_sitearch}/mpich2 \
+    mpiexec.gforker -np 1 python2 test/runtests.py
 PYTHONPATH=%{buildroot}%{python_sitearch}/mpich2 \
-    python test/runalltest.py
-mpdallexit
+    mpiexec.gforker -np 5 python2 test/runtests.py
+PYTHONPATH=%{buildroot}%{python_sitearch}/mpich2 \
+    mpiexec.gforker -np 8 python2 test/runtests.py
+#mpdallexit
 
 # delte mpd.conf again
-rm mpd.conf
-unset MPD_CONF_FILE
+#rm mpd.conf
+#unset MPD_CONF_FILE
 
 
 %{_mpich2_unload}
@@ -282,7 +304,11 @@ unset MPD_CONF_FILE
 %if 0%{?OPENMPI}
 %{_openmpi_load}
 PYTHONPATH=%{buildroot}%{python3_sitearch}/openmpi \
-    python3 test/runalltest.py
+    mpiexec -np 1 python3 test/runtests.py
+PYTHONPATH=%{buildroot}%{python3_sitearch}/openmpi \
+    mpiexec -np 5 python3 test/runtests.py
+PYTHONPATH=%{buildroot}%{python3_sitearch}/openmpi \
+    mpiexec -np 8 python3 test/runtests.py
 %{_openmpi_unload}
 %endif
 
@@ -291,18 +317,22 @@ PYTHONPATH=%{buildroot}%{python3_sitearch}/openmpi \
 %{_mpich2_load}
 
 # create mpd.conf
-export MPD_CONF_FILE=mpd.conf
-echo MPD_SECRETWORD=$(pwgen -s 50 1) > mpd.conf
-chmod 600 mpd.conf
+#export MPD_CONF_FILE=mpd.conf
+#echo MPD_SECRETWORD=$(pwgen -s 50 1) > mpd.conf
+#chmod 600 mpd.conf
 
-mpd --daemon
+#mpd --daemon
 PYTHONPATH=%{buildroot}%{python3_sitearch}/mpich2 \
-    python3 test/runalltest.py
-mpdallexit
+    mpiexec.gforker -np 1 python3 test/runtests.py
+PYTHONPATH=%{buildroot}%{python3_sitearch}/mpich2 \
+    mpiexec.gforker -np 5 python3 test/runtests.py
+PYTHONPATH=%{buildroot}%{python3_sitearch}/mpich2 \
+    mpiexec.gforker -np 8 python3 test/runtests.py
+#mpdallexit
 
 # delte mpd.conf again
-rm mpd.conf
-unset MPD_CONF_FILE
+#rm mpd.conf
+#unset MPD_CONF_FILE
 
 %{_mpich2_unload}
 %endif # mpd disable
@@ -344,6 +374,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Jan 20 2012 Thomas Spura <tomspur at fedoraproject.org> - 1.3-1
+- update to 1.3
+- filter provides in pythonsitearch
+- run tests differently
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.2-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 1601fb4..b99fa90 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-91c1b962529adfd90b9f9f98db5624b7  mpi4py-1.2.2.tar.gz
+978472a1a71f3142c866c9463dec7103  mpi4py-1.3.tar.gz