Upgrade version to 1.3.22

0001-fix-build-for-pytest.patch

@@ -1,46 +0,0 @@
-From c9dc9e3bc42fa2342198017334a973bc1678f50d Mon Sep 17 00:00:00 2001
-From: baizg1107 <preloyalwhite@163.com>
-Date: Tue, 12 Jan 2021 11:48:13 +0800
-Subject: [PATCH] fix build for pytest
-
----
- lib/sqlalchemy/testing/plugin/pytestplugin.py | 13 +++++++------
- 1 file changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/lib/sqlalchemy/testing/plugin/pytestplugin.py b/lib/sqlalchemy/testing/plugin/pytestplugin.py
-index da682ea..acb9145 100644
---- a/lib/sqlalchemy/testing/plugin/pytestplugin.py
-+++ b/lib/sqlalchemy/testing/plugin/pytestplugin.py
-@@ -123,10 +123,9 @@ def pytest_collection_modifyitems(session, config, items):
-                 test_class.cls, test_class.parent.module):
-             if sub_cls is not test_class.cls:
-                 list_ = rebuilt_items[test_class.cls]
--
--                for inst in pytest.Class(
--                        sub_cls.__name__,
--                        parent=test_class.parent.parent).collect():
-+                for inst in pytest.Class.from_parent(
-+                        parent=test_class.parent.parent,
-+                        name=sub_cls.__name__).collect():
-                     list_.extend(inst.collect())
- 
-     newitems = []
-@@ -148,11 +147,13 @@ def pytest_collection_modifyitems(session, config, items):
- 
- def pytest_pycollect_makeitem(collector, name, obj):
-     if inspect.isclass(obj) and plugin_base.want_class(obj):
--        return pytest.Class(name, parent=collector)
-+        item = pytest.Class.from_parent(parent=collector, name=name, obj=obj)
-+        return item
-     elif inspect.isfunction(obj) and \
-             isinstance(collector, pytest.Instance) and \
-             plugin_base.want_method(collector.cls, obj):
--        return pytest.Function(name, parent=collector)
-+        item = pytest.Function.from_parent(parent=collector, name=name)
-+        return item
-     else:
-         return []
- 
--- 
-2.23.0
-

Skip-test-on-sqlite-3.30+.patch

@@ -1,60 +0,0 @@
-From 6b5d94da84452b125f6788f0e1472b94a43ffc16 Mon Sep 17 00:00:00 2001
-From: Nils Philippsen <nils@tiptoe.de>
-Date: Sat, 2 Nov 2019 17:36:50 -0400
-Subject: [PATCH] Expect ordering NULLs to work and skip nested aggregate tests
- on sqlite >= 3.30.
-
-Fixed test failures which would occur with newer SQLite as of version 3.30
-or greater, due to their addition of nulls ordering syntax as well as new
-restrictions on aggregate functions.  Pull request courtesy Nils Philippsen.
-
-Fixes: #4920
-Closes: #4921
-Pull-request: https://github.com/sqlalchemy/sqlalchemy/pull/4921
-Pull-request-sha: e18534a9045786efdaf4963515222838c62e0300
-
-Change-Id: Idb2fc96e23e7cc96cf96f586208c2db561518202
----
- doc/build/changelog/unreleased_13/4920.rst | 9 +++++++++
- test/requirements.py                       | 5 +++--
- 2 files changed, 12 insertions(+), 2 deletions(-)
- create mode 100644 doc/build/changelog/unreleased_13/4920.rst
-
-diff --git a/doc/build/changelog/unreleased_13/4920.rst b/doc/build/changelog/unreleased_13/4920.rst
-new file mode 100644
-index 0000000000..aabcc570b1
---- /dev/null
-+++ b/doc/build/changelog/unreleased_13/4920.rst
-@@ -0,0 +1,9 @@
-+.. change::
-+    :tags: bug, tests
-+    :tickets: 4920
-+
-+    Fixed test failures which would occur with newer SQLite as of version 3.30
-+    or greater, due to their addition of nulls ordering syntax as well as new
-+    restrictions on aggregate functions.  Pull request courtesy Nils Philippsen.
-+
-+
-diff --git a/test/requirements.py b/test/requirements.py
-index bd6fc8133d..42a24c3a97 100644
---- a/test/requirements.py
-+++ b/test/requirements.py
-@@ -774,7 +774,8 @@ def dbapi_lastrowid(self):
-     @property
-     def nullsordering(self):
-         """Target backends that support nulls ordering."""
--        return fails_on_everything_except('postgresql', 'oracle', 'firebird')
-+        return fails_on_everything_except("postgresql", "oracle", "firebird",
-+                                          "sqlite >= 3.30.0")
- 
-     @property
-     def reflects_pk_names(self):
-@@ -789,7 +790,7 @@ def nested_aggregates(self):
-         """target database can select an aggregate from a subquery that's
-         also using an aggregate"""
- 
--        return skip_if(["mssql"])
-+        return skip_if(["mssql", "sqlite"])
- 
-     @property
-     def array_type(self):

python-sqlalchemy.spec

@@ -1,16 +1,13 @@
 %global __provides_exclude_from ^(%{python2_sitearch}|%{python3_sitearch})/.*\\.so$
 
 Name:           python-sqlalchemy
-Version:        1.2.11
+Version:        1.3.22
-Release:        5
+Release:        1
 Summary:        SQL toolkit and object relational mapper for Python
 License:        MIT
 URL:            http://www.sqlalchemy.org/
 Source0:        https://files.pythonhosted.org/packages/source/S/SQLAlchemy/SQLAlchemy-%{version}.tar.gz
 
-Patch0001:      Skip-test-on-sqlite-3.30+.patch
-Patch0002:	0001-fix-build-for-pytest.patch
-
 BuildRequires:  python3-devel python3-setuptools python3-pytest
 
 %description
@@ -65,6 +62,9 @@ PYTHONPATH=. %{__python3} -m pytest test
 %doc doc examples
 
 %changelog
+* Mon Feb 1 2021 yuanxin <yuanxin24@huawei.com> - 1.3.22-1
+- Upgrade version to 1.3.22
+
 * Tue Jan 12 2021 baizhonggui <baizhonggui@huawei.com> - 1.2.11-5
 - Fix building for pytest