From 7bd8466df452fb8f4386bd512c34ffa019330fd16f735f43fccdbaf81d618872 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Tue, 27 May 2025 08:33:03 +0000 Subject: [PATCH 1/2] Accepting request 1280472 from home:dgarcia:branches:devel:languages:python - Use python3-httpx in pkg_vcmp for Tumbleweed to do not have a fixed python version in that check. OBS-URL: https://build.opensuse.org/request/show/1280472 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-mocket?expand=0&rev=99 --- python-mocket.changes | 6 ++++++ python-mocket.spec | 11 ++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/python-mocket.changes b/python-mocket.changes index cabefed..d8f4aa0 100644 --- a/python-mocket.changes +++ b/python-mocket.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 27 07:38:10 UTC 2025 - Daniel Garcia + +- Use python3-httpx in pkg_vcmp for Tumbleweed to do not have a fixed + python version in that check. + ------------------------------------------------------------------- Mon May 19 09:09:53 UTC 2025 - Sebastian Wagner diff --git a/python-mocket.spec b/python-mocket.spec index 18e7dba..b8843c0 100644 --- a/python-mocket.spec +++ b/python-mocket.spec @@ -20,6 +20,15 @@ %if "%{flavor}" == "test" %define psuffix -test %bcond_without test + +%if 0%{?suse_version} < 1600 +# Modern stack for Leap 15 +%global mypython python311 +%else +# primary python for Tumbleweed and Leap 16 +%global mypython python3 +%endif + %else %define psuffix %{nil} %bcond_with test @@ -104,7 +113,7 @@ sleep 2 # Checks the ability to record a real request and response. Not available inside obs. donttest="test_asyncio_record_replay or test_truesendall_with_dump_from_recording or test_no_dangling_fds" # The reference recording has different headers in this case -%if %{pkg_vcmp python311-httpx < 0.23} +%if %{pkg_vcmp %{mypython}-httpx < 0.23} donttest="$donttest or test_truesendall_with_dump_from_recording" %endif # fails with new incompatible aiohttp version https://github.com/mindflayer/python-mocket/issues/247 From 3a582d63e6f4a952fb32b8a1024d4edcad1ab645a67138a89ca1aaf4292a333b Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 28 May 2025 07:07:04 +0000 Subject: [PATCH 2/2] - only use python311 on suse platforms OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-mocket?expand=0&rev=101 --- python-mocket.changes | 5 +++++ python-mocket.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/python-mocket.changes b/python-mocket.changes index d8f4aa0..9b484f7 100644 --- a/python-mocket.changes +++ b/python-mocket.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed May 28 07:06:51 UTC 2025 - Dirk Müller + +- only use python311 on suse platforms + ------------------------------------------------------------------- Tue May 27 07:38:10 UTC 2025 - Daniel Garcia diff --git a/python-mocket.spec b/python-mocket.spec index b8843c0..f93d1b4 100644 --- a/python-mocket.spec +++ b/python-mocket.spec @@ -21,7 +21,7 @@ %define psuffix -test %bcond_without test -%if 0%{?suse_version} < 1600 +%if 0%{?suse_version} && 0%{?suse_version} < 1600 # Modern stack for Leap 15 %global mypython python311 %else