From 4930a1e06102b31d954f24c76b0e77d9464ea8f1b345ec70122ed17683233825 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 4 May 2023 16:46:17 +0000 Subject: [PATCH 1/4] - update to SQLalchemy 2.0.x: * 1.x remains available as SQLAlchemy1 Long list of changes, see https://docs.sqlalchemy.org/en/20/changelog/changelog_20.html#change-2.0.12 https://docs.sqlalchemy.org/en/20/changelog/changelog_20.html#change-2.0.11 https://docs.sqlalchemy.org/en/20/changelog/changelog_20.html#change-2.0.10 https://docs.sqlalchemy.org/en/20/changelog/changelog_20.html#change-2.0.9 https://docs.sqlalchemy.org/en/20/changelog/changelog_20.html#change-2.0.8 https://docs.sqlalchemy.org/en/20/changelog/changelog_20.html#change-2.0.7 https://docs.sqlalchemy.org/en/20/changelog/changelog_20.html#change-2.0.6 https://docs.sqlalchemy.org/en/20/changelog/changelog_20.html#change-2.0.5 https://docs.sqlalchemy.org/en/20/changelog/changelog_20.html#change-2.0.4 https://docs.sqlalchemy.org/en/20/changelog/changelog_20.html#change-2.0.3 https://docs.sqlalchemy.org/en/20/changelog/changelog_20.html#change-2.0.2 https://docs.sqlalchemy.org/en/20/changelog/changelog_20.html#change-2.0.1 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-SQLAlchemy?expand=0&rev=228 --- SQLAlchemy-1.4.46.tar.gz | 3 --- SQLAlchemy-2.0.12.tar.gz | 3 +++ python-SQLAlchemy.changes | 19 +++++++++++++++++++ python-SQLAlchemy.spec | 15 +++++++++------ 4 files changed, 31 insertions(+), 9 deletions(-) delete mode 100644 SQLAlchemy-1.4.46.tar.gz create mode 100644 SQLAlchemy-2.0.12.tar.gz diff --git a/SQLAlchemy-1.4.46.tar.gz b/SQLAlchemy-1.4.46.tar.gz deleted file mode 100644 index b4b2629..0000000 --- a/SQLAlchemy-1.4.46.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6913b8247d8a292ef8315162a51931e2b40ce91681f1b6f18f697045200c4a30 -size 8544238 diff --git a/SQLAlchemy-2.0.12.tar.gz b/SQLAlchemy-2.0.12.tar.gz new file mode 100644 index 0000000..7c72bd0 --- /dev/null +++ b/SQLAlchemy-2.0.12.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bddfc5bd1dee5db0fddc9dab26f800c283f3243e7281bbf107200fed30125f9c +size 9264506 diff --git a/python-SQLAlchemy.changes b/python-SQLAlchemy.changes index 775bfc1..b7e7a96 100644 --- a/python-SQLAlchemy.changes +++ b/python-SQLAlchemy.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Thu May 4 15:48:19 UTC 2023 - Dirk Müller + +- update to SQLalchemy 2.0.x: + * 1.x remains available as SQLAlchemy1 + Long list of changes, see + https://docs.sqlalchemy.org/en/20/changelog/changelog_20.html#change-2.0.12 + https://docs.sqlalchemy.org/en/20/changelog/changelog_20.html#change-2.0.11 + https://docs.sqlalchemy.org/en/20/changelog/changelog_20.html#change-2.0.10 + https://docs.sqlalchemy.org/en/20/changelog/changelog_20.html#change-2.0.9 + https://docs.sqlalchemy.org/en/20/changelog/changelog_20.html#change-2.0.8 + https://docs.sqlalchemy.org/en/20/changelog/changelog_20.html#change-2.0.7 + https://docs.sqlalchemy.org/en/20/changelog/changelog_20.html#change-2.0.6 + https://docs.sqlalchemy.org/en/20/changelog/changelog_20.html#change-2.0.5 + https://docs.sqlalchemy.org/en/20/changelog/changelog_20.html#change-2.0.4 + https://docs.sqlalchemy.org/en/20/changelog/changelog_20.html#change-2.0.3 + https://docs.sqlalchemy.org/en/20/changelog/changelog_20.html#change-2.0.2 + https://docs.sqlalchemy.org/en/20/changelog/changelog_20.html#change-2.0.1 + ------------------------------------------------------------------- Fri Apr 21 12:21:17 UTC 2023 - Dirk Müller diff --git a/python-SQLAlchemy.spec b/python-SQLAlchemy.spec index 6b7e20e..81c04dc 100644 --- a/python-SQLAlchemy.spec +++ b/python-SQLAlchemy.spec @@ -20,7 +20,7 @@ %define oldpython python %{?sle15_python_module_pythons} Name: python-SQLAlchemy -Version: 1.4.46 +Version: 2.0.12 Release: 0 Summary: Database Abstraction Library License: MIT @@ -28,6 +28,7 @@ URL: https://www.sqlalchemy.org Source: https://files.pythonhosted.org/packages/source/S/SQLAlchemy/SQLAlchemy-%{version}.tar.gz Source1: SQLAlchemy.keyring # devel is needed for optional C extensions cprocessors.so, cresultproxy.so and cutils.so +BuildRequires: %{python_module Cython3} BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} BuildRequires: %{pythons} @@ -37,13 +38,17 @@ Requires: python Requires: python-greenlet Provides: python-sqlalchemy = %{version} Obsoletes: python-sqlalchemy < %{version} +Conflicts: python-SQLAlchemy1 %if %{python_version_nodots} < 38 Requires: python-importlib-metadata %endif # SECTION test requirements -BuildRequires: %{python_module greenlet} +BuildRequires: %{python_module greenlet > 0.4.17} BuildRequires: %{python_module importlib-metadata} +BuildRequires: %{python_module mypy} BuildRequires: %{python_module pytest >= 4.4.0} +BuildRequires: %{python_module pytest-xdist} +BuildRequires: %{python_module typing_extensions >= 4.2.0} # /SECTION %python_subpackages @@ -80,13 +85,11 @@ export CFLAGS="%{optflags} -fno-strict-aliasing" %python_expand %fdupes %{buildroot}%{$python_sitearch} %check -# One test fails on Python 3.6 -# packaging.version.InvalidVersion: Invalid version: 'SQLAlchemy' -%pytest_arch -k 'not (test_parseconnect and CreateEngineTest and test_bad_args)' +%pytest_arch %{?jobs:-n %jobs} -k 'not (test_parseconnect and CreateEngineTest and test_bad_args)' %files %{python_files} %license LICENSE -%doc CHANGES README.rst README.dialects.rst README.unittests.rst +%doc CHANGES.rst README.rst README.dialects.rst README.unittests.rst %{python_sitearch}/sqlalchemy/ %{python_sitearch}/SQLAlchemy-%{version}-py*.egg-info From 43c263251d6d0b0a96b1967ff556749b369260d69147c6b6126656e658561c3f Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 4 May 2023 19:12:13 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-SQLAlchemy?expand=0&rev=229 --- python-SQLAlchemy.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/python-SQLAlchemy.spec b/python-SQLAlchemy.spec index 81c04dc..acc1122 100644 --- a/python-SQLAlchemy.spec +++ b/python-SQLAlchemy.spec @@ -85,7 +85,9 @@ export CFLAGS="%{optflags} -fno-strict-aliasing" %python_expand %fdupes %{buildroot}%{$python_sitearch} %check -%pytest_arch %{?jobs:-n %jobs} -k 'not (test_parseconnect and CreateEngineTest and test_bad_args)' +jobs=1 +test "%{jobs}" -gt 4 && jobs=4 +%pytest_arch -n $jobs -k 'not (test_parseconnect and CreateEngineTest and test_bad_args)' %files %{python_files} %license LICENSE From 00118433a3706f69e92a6561c70adc4c2835afd15293e83829f745bc258a968a Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 8 May 2023 08:22:48 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-SQLAlchemy?expand=0&rev=230 --- python-SQLAlchemy.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-SQLAlchemy.spec b/python-SQLAlchemy.spec index acc1122..a3e0433 100644 --- a/python-SQLAlchemy.spec +++ b/python-SQLAlchemy.spec @@ -86,7 +86,7 @@ export CFLAGS="%{optflags} -fno-strict-aliasing" %check jobs=1 -test "%{jobs}" -gt 4 && jobs=4 +test "%{jobs}" -gt 2 && jobs=2 %pytest_arch -n $jobs -k 'not (test_parseconnect and CreateEngineTest and test_bad_args)' %files %{python_files} From 9e9c60df501f3bf55a3fa7ce527ccaf8df95562091edaefd57f0a0b09106de05 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 8 May 2023 08:25:25 +0000 Subject: [PATCH 4/4] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-SQLAlchemy?expand=0&rev=231 --- python-SQLAlchemy.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/python-SQLAlchemy.spec b/python-SQLAlchemy.spec index a3e0433..efe80d8 100644 --- a/python-SQLAlchemy.spec +++ b/python-SQLAlchemy.spec @@ -85,9 +85,7 @@ export CFLAGS="%{optflags} -fno-strict-aliasing" %python_expand %fdupes %{buildroot}%{$python_sitearch} %check -jobs=1 -test "%{jobs}" -gt 2 && jobs=2 -%pytest_arch -n $jobs -k 'not (test_parseconnect and CreateEngineTest and test_bad_args)' +%pytest_arch -n2 -q --nomemory --notimingintensive --nomypy -k 'not (test_parseconnect and CreateEngineTest and test_bad_args)' %files %{python_files} %license LICENSE