diff --git a/.files b/.files index 8eb8598..6478640 100644 Binary files a/.files and b/.files differ diff --git a/.rev b/.rev index d9a58b6..be8b19f 100644 --- a/.rev +++ b/.rev @@ -72,4 +72,16 @@ 1037887 + + 94d6df493f8528a1435680a949c9facd + 0.7.0 + + dimstar_suse + - Update to 0.7.0: + * Fixed breaking changes in SQLAlchemy cursor; supports >=1.4.42,<1.5 + * Wrapped types in typing.Optional where applicable +- Change {Build,}Requires for SQLAlchemy so we don't install >= 2. +- Drop patch sqlalchemy1442.patch, included upstream. + 1091001 + diff --git a/databases-0.6.2.tar.gz b/databases-0.6.2.tar.gz deleted file mode 120000 index 78461ca..0000000 --- a/databases-0.6.2.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafkreicpjcsptokycdpwgo7cry2w7ji652yuqzacqqyabozvlqyf3gbe2y \ No newline at end of file diff --git a/databases-0.7.0.tar.gz b/databases-0.7.0.tar.gz new file mode 120000 index 0000000..0f7fedc --- /dev/null +++ b/databases-0.7.0.tar.gz @@ -0,0 +1 @@ +/ipfs/bafkreigjhdzhqzorzmyeqofmbfrdgkyh5zzycznx7vezhedrsxprczjqfq \ No newline at end of file diff --git a/python-databases.changes b/python-databases.changes index 662165a..86ddf60 100644 --- a/python-databases.changes +++ b/python-databases.changes @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Tue Jun 6 01:56:24 UTC 2023 - Steve Kowalik + +- Update to 0.7.0: + * Fixed breaking changes in SQLAlchemy cursor; supports >=1.4.42,<1.5 + * Wrapped types in typing.Optional where applicable +- Change {Build,}Requires for SQLAlchemy so we don't install >= 2. +- Drop patch sqlalchemy1442.patch, included upstream. + +------------------------------------------------------------------- Thu Nov 24 11:40:22 UTC 2022 - Daniel Garcia - Add patch sqlalchemy1442.patch to make it compatible with latest sqlalchemy diff --git a/python-databases.spec b/python-databases.spec index 01e6e66..3645f61 100644 --- a/python-databases.spec +++ b/python-databases.spec @@ -1,7 +1,7 @@ # # spec file for package python-databases # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,21 +18,16 @@ %define skip_python2 1 Name: python-databases -Version: 0.6.2 +Version: 0.7.0 Release: 0 Summary: Async database support for Python License: BSD-3-Clause URL: https://github.com/encode/databases Source: https://github.com/encode/databases/archive/%{version}.tar.gz#/databases-%{version}.tar.gz -# PATCH-FIX-UPSTREAM sqlalchemy1442.patch gh#encode/databases#513 -Patch: sqlalchemy1442.patch BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros -Requires: python-sqlalchemy >= 1.4 -%if 0%{?python_version_nodots} < 37 -Requires: python-aiocontextvars -%endif +Requires: (python-sqlalchemy >= 1.4 with python-sqlalchemy < 2) Suggests: python-aiomysql Suggests: python-aiopg Suggests: python-aiosqlite @@ -40,11 +35,10 @@ Suggests: python-asyncpg BuildArch: noarch # SECTION test requirements BuildRequires: %{python_module aiosqlite} -BuildRequires: %{python_module aiocontextvars if %python-base < 3.7} BuildRequires: %{python_module asyncpg} BuildRequires: %{python_module pytest} BuildRequires: %{python_module requests} -BuildRequires: %{python_module sqlalchemy >= 1.4} +BuildRequires: %{python_module sqlalchemy >= 1.4 with %python-sqlalchemy < 2} # /SECTION %python_subpackages diff --git a/sqlalchemy1442.patch b/sqlalchemy1442.patch deleted file mode 100644 index 627cf0a..0000000 --- a/sqlalchemy1442.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/databases/backends/aiopg.py b/databases/backends/aiopg.py -index 60c741a..1d35749 100644 ---- a/databases/backends/aiopg.py -+++ b/databases/backends/aiopg.py -@@ -221,6 +221,7 @@ def _compile( - compiled._result_columns, - compiled._ordered_columns, - compiled._textual_ordered_columns, -+ compiled._ad_hoc_textual, - compiled._loose_column_name_matching, - ) - else: -diff --git a/databases/backends/asyncmy.py b/databases/backends/asyncmy.py -index e15dfa4..233d2e0 100644 ---- a/databases/backends/asyncmy.py -+++ b/databases/backends/asyncmy.py -@@ -211,6 +211,7 @@ def _compile( - compiled._result_columns, - compiled._ordered_columns, - compiled._textual_ordered_columns, -+ compiled._ad_hoc_textual, - compiled._loose_column_name_matching, - ) - else: -diff --git a/databases/backends/mysql.py b/databases/backends/mysql.py -index 2a0a842..c7ac9f4 100644 ---- a/databases/backends/mysql.py -+++ b/databases/backends/mysql.py -@@ -211,6 +211,7 @@ def _compile( - compiled._result_columns, - compiled._ordered_columns, - compiled._textual_ordered_columns, -+ compiled._ad_hoc_textual, - compiled._loose_column_name_matching, - ) - else: -diff --git a/databases/backends/sqlite.py b/databases/backends/sqlite.py -index 9626dcf..69ef5b5 100644 ---- a/databases/backends/sqlite.py -+++ b/databases/backends/sqlite.py -@@ -185,6 +185,7 @@ def _compile( - compiled._result_columns, - compiled._ordered_columns, - compiled._textual_ordered_columns, -+ compiled._ad_hoc_textual, - compiled._loose_column_name_matching, - ) -