From 6d92679e4dca0953b6849788e08d174e34a767071467ef7abed4b0d677d3c2ec Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 12 Oct 2023 14:09:26 +0000 Subject: [PATCH 1/4] - Skip test_multi_socket_select (gh#pycurl/pycurl#819) OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pycurl?expand=0&rev=99 --- python-pycurl.changes | 5 +++++ python-pycurl.spec | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/python-pycurl.changes b/python-pycurl.changes index 3b51141..4eca9f7 100644 --- a/python-pycurl.changes +++ b/python-pycurl.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 12 14:09:12 UTC 2023 - Matej Cepl + +- Skip test_multi_socket_select (gh#pycurl/pycurl#819) + ------------------------------------------------------------------- Sun Apr 23 23:18:42 UTC 2023 - Matej Cepl diff --git a/python-pycurl.spec b/python-pycurl.spec index 4f7cced..ac31429 100644 --- a/python-pycurl.spec +++ b/python-pycurl.spec @@ -120,7 +120,8 @@ if ! pkg-config --variable=supported_protocols libcurl|grep -qw HTTP3; then test_flags="$test_flags or http_version_3" fi # test_getinfo are failing with new bottle -%pytest_arch -s -k "not ($test_flags or test_getinfo)" +# test_multi_socket_select fails with new curl gh#pycurl/pycurl#819 +%pytest_arch -s -k "not ($test_flags or test_getinfo or test_multi_socket_select)" rm -rf %{buildroot}%{_prefix}/lib/debug %{buildroot}%{_libdir}/python* # test %endif From 240cef0febf90c23fa38e5a4313a5c246208175a3c8492876847c066b40054de Mon Sep 17 00:00:00 2001 From: Ana Guerrero Date: Thu, 12 Oct 2023 16:44:01 +0000 Subject: [PATCH 2/4] Accepting request 1117496 from home:anag:Factory - Skip test_multi_socket_action as well. OBS-URL: https://build.opensuse.org/request/show/1117496 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pycurl?expand=0&rev=100 --- python-pycurl.changes | 5 +++++ python-pycurl.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/python-pycurl.changes b/python-pycurl.changes index 4eca9f7..ba2fef3 100644 --- a/python-pycurl.changes +++ b/python-pycurl.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 12 16:23:50 UTC 2023 - Ana Guerrero + +- Skip test_multi_socket_action as well. + ------------------------------------------------------------------- Thu Oct 12 14:09:12 UTC 2023 - Matej Cepl diff --git a/python-pycurl.spec b/python-pycurl.spec index ac31429..89c924f 100644 --- a/python-pycurl.spec +++ b/python-pycurl.spec @@ -121,7 +121,7 @@ if ! pkg-config --variable=supported_protocols libcurl|grep -qw HTTP3; then fi # test_getinfo are failing with new bottle # test_multi_socket_select fails with new curl gh#pycurl/pycurl#819 -%pytest_arch -s -k "not ($test_flags or test_getinfo or test_multi_socket_select)" +%pytest_arch -s -k "not ($test_flags or test_getinfo or test_multi_socket_select or test_multi_socket_action)" rm -rf %{buildroot}%{_prefix}/lib/debug %{buildroot}%{_libdir}/python* # test %endif From 2de07c02b1ad6421bde5fb9e7cd515a9c86f818f36b4b3d7af0c8d2ff8310109 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 12 Oct 2023 18:11:45 +0000 Subject: [PATCH 3/4] - Skip test_multi_socket_select (gh#pycurl/pycurl#819), test_multi_socket_action (gh#pycurl/pycurl#729), and test_request_with_verifypeer (gh#pycurl/pycurl#822). OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pycurl?expand=0&rev=101 --- python-pycurl.changes | 4 +++- python-pycurl.spec | 12 ++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/python-pycurl.changes b/python-pycurl.changes index ba2fef3..0b9307c 100644 --- a/python-pycurl.changes +++ b/python-pycurl.changes @@ -6,7 +6,9 @@ Thu Oct 12 16:23:50 UTC 2023 - Ana Guerrero ------------------------------------------------------------------- Thu Oct 12 14:09:12 UTC 2023 - Matej Cepl -- Skip test_multi_socket_select (gh#pycurl/pycurl#819) +- Skip test_multi_socket_select (gh#pycurl/pycurl#819), + test_multi_socket_action (gh#pycurl/pycurl#729), and + test_request_with_verifypeer (gh#pycurl/pycurl#822). ------------------------------------------------------------------- Sun Apr 23 23:18:42 UTC 2023 - Matej Cepl diff --git a/python-pycurl.spec b/python-pycurl.spec index 89c924f..aa3236c 100644 --- a/python-pycurl.spec +++ b/python-pycurl.spec @@ -120,8 +120,14 @@ if ! pkg-config --variable=supported_protocols libcurl|grep -qw HTTP3; then test_flags="$test_flags or http_version_3" fi # test_getinfo are failing with new bottle +dont_test="or test_getinfo " # test_multi_socket_select fails with new curl gh#pycurl/pycurl#819 -%pytest_arch -s -k "not ($test_flags or test_getinfo or test_multi_socket_select or test_multi_socket_action)" +dont_test+="or test_multi_socket_select " +# test_multi_socket_action gh#pycurl/pycurl#729 +dont_test+="or test_multi_socket_action " +# test_request_with_verifypeer for gh#pycurl/pycurl#822 +dont_test+="or test_request_with_verifypeer " +%pytest_arch -s -k "not ($test_flags $dont_test)" rm -rf %{buildroot}%{_prefix}/lib/debug %{buildroot}%{_libdir}/python* # test %endif @@ -130,7 +136,9 @@ rm -rf %{buildroot}%{_prefix}/lib/debug %{buildroot}%{_libdir}/python* %files %{python_files} %license COPYING-LGPL COPYING-MIT %doc AUTHORS ChangeLog README.rst -%{python_sitearch}/* +%{python_sitearch}/curl +%{python_sitearch}/pycurl*.so +%{python_sitearch}/pycurl-%{version}*-info %if 0%{?suse_version} > 1500 %files -n %{name}-doc From c3d2f88363bf61620ace49e0ddf2b4c182e5d1c2d3b76ba3fb75133b35dcd9d8 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 12 Oct 2023 18:13:29 +0000 Subject: [PATCH 4/4] Fix changelog OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pycurl?expand=0&rev=102 --- python-pycurl.changes | 5 ----- 1 file changed, 5 deletions(-) diff --git a/python-pycurl.changes b/python-pycurl.changes index 0b9307c..50ef3cd 100644 --- a/python-pycurl.changes +++ b/python-pycurl.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Thu Oct 12 16:23:50 UTC 2023 - Ana Guerrero - -- Skip test_multi_socket_action as well. - ------------------------------------------------------------------- Thu Oct 12 14:09:12 UTC 2023 - Matej Cepl