Accepting request 1205723 from devel:languages:python

- Switching off test_multi_ tests, they are just too
  unrealiable. When running the test cycle in cycle I have never
  managed to make it pass ten times without this change.

OBS-URL: https://build.opensuse.org/request/show/1205723
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-pycurl?expand=0&rev=48

_service

@@ -1,15 +0,0 @@
-<services>
-  <service name="obs_scm" mode="manual">
-    <param name="versionprefix">7.45.3+git</param>
-    <param name="url">https://github.com/pycurl/pycurl.git</param>
-    <param name="scm">git</param>
-    <param name="revision">main</param>
-    <param name="changesgenerate">enable</param>
-  </service>
-  <service name="tar" mode="manual"/>
-  <service name="recompress" mode="manual">
-    <param name="file">*.tar</param>
-    <param name="compression">gz</param>
-  </service>
-  <service name="set_version" mode="manual" />
-</services>

increase_test_timeout.diff

@@ -1,10 +1,8 @@
----
+Index: pycurl-7.43.0/tests/runwsgi.py
- tests/runwsgi.py |    4 ++--
+===================================================================
- 1 file changed, 2 insertions(+), 2 deletions(-)
+--- pycurl-7.43.0.orig/tests/runwsgi.py
-
++++ pycurl-7.43.0/tests/runwsgi.py
---- a/tests/runwsgi.py
+@@ -48,10 +48,10 @@ def start_bottle_server(app, port, serve
-+++ b/tests/runwsgi.py
-@@ -56,10 +56,10 @@ def start_bottle_server(app, port, serve
      server_thread.daemon = True
      server_thread.start()
  

pycurl-libssh.patch

@@ -1,7 +1,3 @@
----
- tests/ssh_key_cb_test.py |   31 +++++++++++++++++++++++--------
- 1 file changed, 23 insertions(+), 8 deletions(-)
-
 --- a/tests/ssh_key_cb_test.py
 +++ b/tests/ssh_key_cb_test.py
 @@ -33,8 +33,11 @@ class SshKeyCbTest(unittest.TestCase):

python-pycurl.changes

@@ -1,8 +1,3 @@
--------------------------------------------------------------------
-Mon Dec  9 09:38:48 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
-
-- Switch to %pyproject_*.
-
 -------------------------------------------------------------------
 Fri Oct  4 14:25:56 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
 

python-pycurl.spec

@@ -28,13 +28,11 @@
 %{?sle15_python_module_pythons}
 Name:           python-pycurl%{psuffix}
 Version:        7.45.3
-%global upversion %{version}
 Release:        0
 Summary:        PycURL -- cURL library module
 License:        LGPL-2.1-or-later AND MIT
 URL:            http://pycurl.io/
 Source:         https://files.pythonhosted.org/packages/source/p/pycurl/pycurl-%{version}.tar.gz
-# Source:         pycurl-%%{version}.tar.gz
 # PATCH-FIX-OPENSUSE increase_test_timeout.diff -- Increase the timeout in a test so it doesn't fail when obs is overloaded
 Patch0:         increase_test_timeout.diff
 # PATCH-FIX-UPSTREAM handle difference between libssh and libssh2
@@ -46,9 +44,7 @@ Patch3:         make-leap15-compat.patch
 # PATCH-FIX-UPSTREAM test-bottle-flask.patch gh#pycurl/pycurl#838
 Patch4:         test-bottle-flask.patch
 BuildRequires:  %{python_module devel}
-BuildRequires:  %{python_module pip}
 BuildRequires:  %{python_module setuptools}
-BuildRequires:  %{python_module wheel}
 BuildRequires:  fdupes
 BuildRequires:  pkgconfig
 BuildRequires:  python-rpm-macros
@@ -90,11 +86,11 @@ rm -f tests/failonerror_test.py
 %build
 export CFLAGS="%{optflags} -fno-strict-aliasing"
 export PYCURL_SSL_LIBRARY=openssl
-%pyproject_wheel
+%python_build --with-openssl
 
 %install
 export PYCURL_SSL_LIBRARY=openssl
-%pyproject_install
+%python_install --with-openssl
 
 rm -rf %{buildroot}%{_datadir}/doc # Remove wrongly installed junk
 
@@ -112,7 +108,7 @@ export PYCURL_SSL_LIBRARY=openssl
 # not the rest of the mess in the upstream runner
 pushd tests/fake-curl/libcurl
 rm -f *.so
-%make_build
+make %{?_smp_mflags}
 popd
 # exclude certain tests
 test_flags='online or occasionally_failing'
@@ -146,7 +142,7 @@ rm -rf %{buildroot}%{_prefix}/lib/debug %{buildroot}%{_libdir}/python*
 %doc AUTHORS ChangeLog README.rst
 %{python_sitearch}/curl
 %{python_sitearch}/pycurl*.so
-%{python_sitearch}/pycurl-%{upversion}*-info
+%{python_sitearch}/pycurl-%{version}*-info
 
 %if 0%{?suse_version} > 1500
 %files -n %{name}-doc