14
0

- Drop patch py313-tests.patch, included in:

- Add patch support-python-313.patch:
  * Support Python 3.13.

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-psycopg2?expand=0&rev=98
This commit is contained in:
2024-10-29 05:08:38 +00:00
committed by Git OBS Bridge
parent 16e3753760
commit 1c0bc8f6b4
3 changed files with 40 additions and 3 deletions

View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Oct 29 05:08:18 UTC 2024 - Steve Kowalik <steven.kowalik@suse.com>
- Drop patch py313-tests.patch, included in:
- Add patch support-python-313.patch:
* Support Python 3.13.
-------------------------------------------------------------------
Mon Oct 28 21:56:17 UTC 2024 - Dirk Müller <dmueller@suse.com>

View File

@@ -24,7 +24,8 @@ Summary: Python-PostgreSQL Database Adapter
License: LGPL-3.0-or-later AND (LGPL-3.0-or-later OR ZPL-2.0) AND SUSE-GPL-2.0-with-openssl-exception
URL: https://www.psycopg.org/
Source: https://files.pythonhosted.org/packages/source/p/psycopg2/psycopg2-%{version}.tar.gz
Patch1: https://github.com/psycopg/psycopg2/commit/3b9aa7cf9f3b000407dc0ee8e77fbcf54fa04d7f.patch#/py313-tests.patch
# PATCH-FIX-UPSTREAM gh#psycopg/psycopg2#1695
Patch0: support-python-313.patch
BuildRequires: %{python_module devel >= 3.7}
BuildRequires: %{python_module pip}
BuildRequires: %{python_module setuptools}
@@ -73,6 +74,6 @@ export CFLAGS="%{optflags} -fno-strict-aliasing"
%license LICENSE
%doc AUTHORS NEWS README.rst
%{python_sitearch}/psycopg2/
%{python_sitearch}/psycopg2-%{version}*-info
%{python_sitearch}/psycopg2-%{version}.dist-info
%changelog

View File

@@ -1,7 +1,36 @@
From 829a7a2be93f5d0fb1edbc0feb104181f208efc6 Mon Sep 17 00:00:00 2001
From: Karolina Surma <ksurma@redhat.com>
Date: Wed, 24 Apr 2024 09:50:32 +0200
Subject: [PATCH 1/6] _PyInterpreterState_Get() has become public in Python
3.13
Since 3.13.0a1 it has been renamed to PyInterpreterStateGet()
Source: https://github.com/python/cpython/pull/106321
---
psycopg/utils.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/psycopg/utils.c b/psycopg/utils.c
index 16be9062a..1dfb87d0b 100644
--- a/psycopg/utils.c
+++ b/psycopg/utils.c
@@ -392,7 +392,10 @@ psyco_set_error(PyObject *exc, cursorObject *curs, const char *msg)
static int
psyco_is_main_interp(void)
{
-#if PY_VERSION_HEX >= 0x03080000
+#if PY_VERSION_HEX >= 0x030d0000
+ /* tested with Python 3.13.0a6 */
+ return PyInterpreterState_Get() == PyInterpreterState_Main();
+#elif PY_VERSION_HEX >= 0x03080000
/* tested with Python 3.8.0a2 */
return _PyInterpreterState_Get() == PyInterpreterState_Main();
#else
From 3b9aa7cf9f3b000407dc0ee8e77fbcf54fa04d7f Mon Sep 17 00:00:00 2001
From: Karolina Surma <ksurma@redhat.com>
Date: Wed, 24 Apr 2024 09:56:08 +0200
Subject: [PATCH] Fix tests with Python 3.13
Subject: [PATCH 2/6] Fix tests with Python 3.13
The textual representation of addresses has changed, adapt the code to
expect different values on Python 3.13+.