From 2013478ff268cfe34fc82694a2bd54a58c696ef55ef0c0d09de1cb3de9da2ac9 Mon Sep 17 00:00:00 2001
From: Daniel Garcia <daniel.garcia@suse.com>
Date: Mon, 29 May 2023 15:43:35 +0000
Subject: [PATCH] - Add sqlalchemy-2.0.patch to support latest version of
 sqlalchemy.   gh#celery/celery#8271

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-celery?expand=0&rev=151
---
 python-celery.changes |  6 ++++++
 python-celery.spec    |  6 ++++--
 sqlalchemy-2.0.patch  | 19 +++++++++++++++++++
 3 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 sqlalchemy-2.0.patch

diff --git a/python-celery.changes b/python-celery.changes
index da2717f..d054aa6 100644
--- a/python-celery.changes
+++ b/python-celery.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon May 29 15:38:50 UTC 2023 - Daniel Garcia <daniel.garcia@suse.com>
+
+- Add sqlalchemy-2.0.patch to support latest version of sqlalchemy.
+  gh#celery/celery#8271
+
 -------------------------------------------------------------------
 Tue Mar 28 09:19:04 UTC 2023 - Dirk Müller <dmueller@suse.com>
 
diff --git a/python-celery.spec b/python-celery.spec
index 3aa9623..8e2f59f 100644
--- a/python-celery.spec
+++ b/python-celery.spec
@@ -16,7 +16,6 @@
 #
 
 
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
 %define skip_python2 1
 %global flavor @BUILD_FLAVOR@%{nil}
 %if "%{flavor}" == "test"
@@ -39,6 +38,8 @@ Patch1:         tests.patch
 # PATCH-FIX-UPSTREAM compatibility with newer billiard
 Patch2:         https://github.com/celery/celery/commit/b260860988469ef8ad74f2d4225839c2fa91d590.patch
 Patch3:         https://github.com/celery/celery/commit/879af6341974c3778077d8212d78f093b2d77a4f.patch
+# PATCH-FIX-UPSTREAM sqlalchemy-2.0.patch -- gh#celery/celery#8271
+Patch4:         sqlalchemy-2.0.patch
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
 BuildRequires:  netcfg
@@ -122,7 +123,8 @@ scheduling as well.
 %python_uninstall_alternative celery
 
 %files %{python_files}
-%{python_sitelib}/*
+%{python_sitelib}/celery
+%{python_sitelib}/celery-%{version}*-info
 %license LICENSE
 %doc README.rst TODO
 %python_alternative %{_bindir}/celery
diff --git a/sqlalchemy-2.0.patch b/sqlalchemy-2.0.patch
new file mode 100644
index 0000000..875226f
--- /dev/null
+++ b/sqlalchemy-2.0.patch
@@ -0,0 +1,19 @@
+Index: celery-5.2.7/t/unit/backends/test_database.py
+===================================================================
+--- celery-5.2.7.orig/t/unit/backends/test_database.py
++++ celery-5.2.7/t/unit/backends/test_database.py
+@@ -410,7 +410,13 @@ class test_SessionManager:
+         from sqlalchemy.dialects.sqlite import dialect
+         from sqlalchemy.exc import DatabaseError
+ 
+-        sqlite = dialect.dbapi()
++        if hasattr(dialect, 'dbapi'):
++            # Method name in SQLAlchemy < 2.0
++            sqlite = dialect.dbapi()
++        else:
++            # Newer method name in SQLAlchemy 2.0
++            sqlite = dialect.import_dbapi()
++
+         manager = SessionManager()
+         engine = manager.get_engine('dburi')
+