From 3fb068db778568f9ce50c166ffcf852e6ea667d5 Mon Sep 17 00:00:00 2001 From: sxt1001 Date: Thu, 3 Dec 2020 19:28:57 +0800 Subject: [PATCH] fix test_order_by_nulls error --- Expect_ordering_NULLs_to_work.patch | 27 +++++++++++++++++++++++++++ python-sqlalchemy.spec | 7 ++++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 Expect_ordering_NULLs_to_work.patch diff --git a/Expect_ordering_NULLs_to_work.patch b/Expect_ordering_NULLs_to_work.patch new file mode 100644 index 0000000..dc30692 --- /dev/null +++ b/Expect_ordering_NULLs_to_work.patch @@ -0,0 +1,27 @@ +From 8b35ba54ab31aab13a34c360a31d014da1f5c809 Mon Sep 17 00:00:00 2001 +From: Nils Philippsen +Date: Thu, 17 Oct 2019 18:22:09 +0200 +Subject: [PATCH] Expect ordering NULLs to work on sqlite >= 3.30. + +Signed-off-by: Nils Philippsen +--- + test/requirements.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/test/requirements.py b/test/requirements.py +index 5906432..deb4ced 100644 +--- a/test/requirements.py ++++ b/test/requirements.py +@@ -727,7 +727,8 @@ class DefaultRequirements(SuiteRequirements): + @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): +-- +2.19.1 + diff --git a/python-sqlalchemy.spec b/python-sqlalchemy.spec index e474737..2fea3d1 100644 --- a/python-sqlalchemy.spec +++ b/python-sqlalchemy.spec @@ -2,12 +2,14 @@ Name: python-sqlalchemy Version: 1.2.19 -Release: 1 +Release: 2 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 +Patch1: Expect_ordering_NULLs_to_work.patch + BuildRequires: python2-devel >= 2.6 python2-setuptools python2-mock python2-pytest BuildRequires: python3-devel python3-setuptools python3-pytest @@ -87,6 +89,9 @@ PYTHONPATH=. %{__python3} -m pytest test %doc doc examples %changelog +* Thu Dec 03 2020 shixuantong - 1.2.19-2 +- fix test_order_by_nulls error + * Mon Aug 31 2020 pengyeqing - 1.2.19-1 - update to 1.2.19 -- Gitee