diff --git a/.gitignore b/.gitignore index 2008f95..9c7cfdb 100644 --- a/.gitignore +++ b/.gitignore @@ -109,3 +109,4 @@ SQLAlchemy-0.6.1.tar.gz /SQLAlchemy-1.4.42.tar.gz /SQLAlchemy-1.4.43.tar.gz /SQLAlchemy-1.4.44.tar.gz +/SQLAlchemy-1.4.45.tar.gz diff --git a/0001-Repair-test-in-32bit-python-builds.patch b/0001-Repair-test-in-32bit-python-builds.patch deleted file mode 100644 index 0606c72..0000000 --- a/0001-Repair-test-in-32bit-python-builds.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 3d892381996e7ba68ee3bf6d7de40c8414e3812a Mon Sep 17 00:00:00 2001 -From: Federico Caselli -Date: Sat, 12 Nov 2022 20:15:26 +0100 -Subject: [PATCH] Repair test in 32bit python builds. - -Change-Id: I8287f3e1a975534c8a01a41c9dcc7e5e9f08bb52 -(cherry picked from commit 9f4ac8d155f58b59cf314cfbc73195ed51a0c146) ---- - lib/sqlalchemy/testing/requirements.py | 4 ++++ - lib/sqlalchemy/util/__init__.py | 1 + - lib/sqlalchemy/util/compat.py | 1 + - test/orm/test_cache_key.py | 6 +++++- - 4 files changed, 11 insertions(+), 1 deletion(-) - -diff --git a/lib/sqlalchemy/testing/requirements.py b/lib/sqlalchemy/testing/requirements.py -index 069ff747d..8cd4c64f2 100644 ---- a/lib/sqlalchemy/testing/requirements.py -+++ b/lib/sqlalchemy/testing/requirements.py -@@ -1312,6 +1312,10 @@ class SuiteRequirements(Requirements): - lambda: util.cpython, "cPython interpreter needed" - ) - -+ @property -+ def is64bit(self): -+ return exclusions.only_if(lambda: util.is64bit, "64bit required") -+ - @property - def patch_library(self): - def check_lib(): -diff --git a/lib/sqlalchemy/util/__init__.py b/lib/sqlalchemy/util/__init__.py -index d6ce64903..c34f73dca 100644 ---- a/lib/sqlalchemy/util/__init__.py -+++ b/lib/sqlalchemy/util/__init__.py -@@ -64,6 +64,7 @@ from .compat import dottedgetter - from .compat import has_refcount_gc - from .compat import inspect_getfullargspec - from .compat import int_types -+from .compat import is64bit - from .compat import iterbytes - from .compat import itertools_filter - from .compat import itertools_filterfalse -diff --git a/lib/sqlalchemy/util/compat.py b/lib/sqlalchemy/util/compat.py -index 2c2a1a77a..2b5a2c0ef 100644 ---- a/lib/sqlalchemy/util/compat.py -+++ b/lib/sqlalchemy/util/compat.py -@@ -29,6 +29,7 @@ cpython = platform.python_implementation() == "CPython" - win32 = sys.platform.startswith("win") - osx = sys.platform.startswith("darwin") - arm = "aarch" in platform.machine().lower() -+is64bit = platform.architecture()[0] == "64bit" - - has_refcount_gc = bool(cpython) - -diff --git a/test/orm/test_cache_key.py b/test/orm/test_cache_key.py -index 169df909e..6720baf02 100644 ---- a/test/orm/test_cache_key.py -+++ b/test/orm/test_cache_key.py -@@ -1087,7 +1087,11 @@ class EmbeddedSubqTest(_RemoveListeners, DeclarativeMappedTest): - "concrete": True, - } - -- @testing.combinations("tuples", "memory", argnames="assert_on") -+ Base.registry.configure() -+ -+ @testing.combinations( -+ "tuples", ("memory", testing.requires.is64bit), argnames="assert_on" -+ ) - def test_cache_key_gen(self, assert_on): - Employee = self.classes.Employee - --- -2.38.1 - diff --git a/python-sqlalchemy.spec b/python-sqlalchemy.spec index 2336e16..6b8e45a 100644 --- a/python-sqlalchemy.spec +++ b/python-sqlalchemy.spec @@ -22,7 +22,7 @@ aiosqlite Name: python-sqlalchemy -Version: 1.4.44 +Version: 1.4.45 # cope with pre-release versions containing tildes %global srcversion %{lua: srcversion, num = rpm.expand("%{version}"):gsub("~", ""); print(srcversion);} Release: %autorelease diff --git a/sources b/sources index 3e91631..b6e52de 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (SQLAlchemy-1.4.44.tar.gz) = ba4e022f7af77cdf099b59a7af088852d7d4e0b4c6d632a63d244f501ff0b76837e601de63619f219fe50e6d526cd13415c4e623a6127afb0a2f24b87a4c3ece +SHA512 (SQLAlchemy-1.4.45.tar.gz) = 4c6e9ef84c6517f47493ad6ce6d366bc0e7222e7a668d43c7b9f4919e87076a5f7687dc525060e430be23c5d9f12e7ef9d97d679040ff132244aa2b3418974a9