From 1522d0c50e6ad7e455dda87f8c5b7ccf1870f517c3664a8d535b331fcf5e7c2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Thu, 8 Feb 2024 10:31:59 +0000 Subject: [PATCH 1/3] Accepting request 1145121 from home:mcalabkova:branches:devel:languages:python - Require backport of the asyncore library on Python 3.12+ OBS-URL: https://build.opensuse.org/request/show/1145121 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-cassandra-driver?expand=0&rev=55 --- python-cassandra-driver.changes | 5 +++++ python-cassandra-driver.spec | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/python-cassandra-driver.changes b/python-cassandra-driver.changes index 93e7d4d..eeaa840 100644 --- a/python-cassandra-driver.changes +++ b/python-cassandra-driver.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Feb 8 09:38:13 UTC 2024 - Markéta Machová + +- Require backport of the asyncore library on Python 3.12+ + ------------------------------------------------------------------- Sun Jun 25 19:02:15 UTC 2023 - Dirk Müller diff --git a/python-cassandra-driver.spec b/python-cassandra-driver.spec index 4768f6e..6586dc7 100644 --- a/python-cassandra-driver.spec +++ b/python-cassandra-driver.spec @@ -1,7 +1,7 @@ # # spec file for package python-cassandra-driver # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -34,6 +34,7 @@ BuildRequires: %{python_module eventlet} BuildRequires: %{python_module geomet >= 0.1} BuildRequires: %{python_module gevent} BuildRequires: %{python_module pure-sasl} +BuildRequires: %{python_module pyasyncore if %python-base > 3.11} BuildRequires: %{python_module pytest} BuildRequires: %{python_module pytz} BuildRequires: %{python_module setuptools} @@ -48,6 +49,9 @@ Requires: python-six >= 1.9 Recommends: python-Twisted Recommends: python-eventlet Recommends: python-gevent +%if 0%{?python_version_nodots} > 311 +Requires: python-pyasyncore +%endif %if %{with python2} BuildRequires: python2-futures %endif From f9feffd205c7e531593315c214c2eecdcabc25c5ed7b4a0f1686eecfb5e14d10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Thu, 8 Feb 2024 11:17:57 +0000 Subject: [PATCH 2/3] Accepting request 1145136 from home:mcalabkova:branches:devel:languages:python - Fix tests on Python 3.12 OBS-URL: https://build.opensuse.org/request/show/1145136 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-cassandra-driver?expand=0&rev=56 --- python-cassandra-driver.changes | 2 +- python-cassandra-driver.spec | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/python-cassandra-driver.changes b/python-cassandra-driver.changes index eeaa840..bd0965e 100644 --- a/python-cassandra-driver.changes +++ b/python-cassandra-driver.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Thu Feb 8 09:38:13 UTC 2024 - Markéta Machová -- Require backport of the asyncore library on Python 3.12+ +- Fix tests on Python 3.12 ------------------------------------------------------------------- Sun Jun 25 19:02:15 UTC 2023 - Dirk Müller diff --git a/python-cassandra-driver.spec b/python-cassandra-driver.spec index 6586dc7..96d72e1 100644 --- a/python-cassandra-driver.spec +++ b/python-cassandra-driver.spec @@ -34,7 +34,6 @@ BuildRequires: %{python_module eventlet} BuildRequires: %{python_module geomet >= 0.1} BuildRequires: %{python_module gevent} BuildRequires: %{python_module pure-sasl} -BuildRequires: %{python_module pyasyncore if %python-base > 3.11} BuildRequires: %{python_module pytest} BuildRequires: %{python_module pytz} BuildRequires: %{python_module setuptools} @@ -43,6 +42,7 @@ BuildRequires: %{python_module sure} BuildRequires: fdupes BuildRequires: libev-devel BuildRequires: python-rpm-macros +BuildRequires: python312-pyasyncore Requires: python-Cython Requires: python-geomet >= 0.1 Requires: python-six >= 1.9 @@ -77,6 +77,8 @@ rm -rf tests/unit/cython rm -f tests/unit/test_types.py # fix hardcoded cython dep sed -i -e 's:Cython>=0.20,!=0.25,<0.29:Cython:g' setup.py +# fix tests on Python 3.12 +sed -i 's/assertRaisesRegexp/assertRaisesRegex/' tests/unit/test_response_future.py %build export CFLAGS="%{optflags}" From c230248c452a8c3263f7e5c665622492c2f9fa7450e8d6ba78db58be5040d269 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Thu, 8 Feb 2024 11:48:14 +0000 Subject: [PATCH 3/3] Accepting request 1145152 from home:mcalabkova:branches:devel:languages:python enable on Backports OBS-URL: https://build.opensuse.org/request/show/1145152 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-cassandra-driver?expand=0&rev=57 --- python-cassandra-driver.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/python-cassandra-driver.spec b/python-cassandra-driver.spec index 96d72e1..76582d4 100644 --- a/python-cassandra-driver.spec +++ b/python-cassandra-driver.spec @@ -42,7 +42,10 @@ BuildRequires: %{python_module sure} BuildRequires: fdupes BuildRequires: libev-devel BuildRequires: python-rpm-macros +%if 0%{?suse_version} >= 1600 +# The classic "if %%python-base > 3.11" made the build unresolvable (at least for me). Sorry for this, feel free to rewrite. BuildRequires: python312-pyasyncore +%endif Requires: python-Cython Requires: python-geomet >= 0.1 Requires: python-six >= 1.9