Update to 1.3.11 (#1771196)

Signed-off-by: Randy Barlow <randy@electronsweatshop.com>
This commit is contained in:
Randy Barlow 2019-11-19 17:07:42 -05:00
parent bceaaf3bec
commit 53aa62ac2e
4 changed files with 8 additions and 65 deletions

1
.gitignore vendored
View File

@ -77,3 +77,4 @@ SQLAlchemy-0.6.1.tar.gz
/SQLAlchemy-1.3.7.tar.gz
/SQLAlchemy-1.3.8.tar.gz
/SQLAlchemy-1.3.10.tar.gz
/SQLAlchemy-1.3.11.tar.gz

View File

@ -1,56 +0,0 @@
From 8b35ba54ab31aab13a34c360a31d014da1f5c809 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@tiptoe.de>
Date: Thu, 17 Oct 2019 18:22:09 +0200
Subject: [PATCH 1/2] Expect ordering NULLs to work on sqlite >= 3.30.
Signed-off-by: Nils Philippsen <nils@tiptoe.de>
---
test/requirements.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/test/requirements.py b/test/requirements.py
index a0d984ef4..7dde12f56 100644
--- a/test/requirements.py
+++ b/test/requirements.py
@@ -772,7 +772,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.23.0
From e18534a9045786efdaf4963515222838c62e0300 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@tiptoe.de>
Date: Fri, 18 Oct 2019 10:09:16 +0200
Subject: [PATCH 2/2] Skip nested aggregate tests on sqlite.
This seems to have stopped working with SQLite 3.30.
Signed-off-by: Nils Philippsen <nils@tiptoe.de>
---
test/requirements.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/requirements.py b/test/requirements.py
index 7dde12f56..388131cc9 100644
--- a/test/requirements.py
+++ b/test/requirements.py
@@ -788,7 +788,7 @@ class DefaultRequirements(SuiteRequirements):
"""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):
--
2.23.0

View File

@ -18,20 +18,16 @@
%global srcname SQLAlchemy
Name: python-sqlalchemy
Version: 1.3.10
Version: 1.3.11
# cope with pre-release versions containing tildes
%global srcversion %{lua: srcversion, num = rpm.expand("%{version}"):gsub("~", ""); print(srcversion);}
Release: 2%{?dist}
Release: 1%{?dist}
Summary: Modular and flexible ORM library for python
License: MIT
URL: http://www.sqlalchemy.org/
Source0: https://files.pythonhosted.org/packages/source/S/%{srcname}/%{srcname}-%{srcversion}.tar.gz
# https://github.com/sqlalchemy/sqlalchemy/issues/4920
# https://github.com/sqlalchemy/sqlalchemy/pull/4921
Patch0: python-sqlalchemy-1.3.10-sqlite-3.30.patch
BuildRequires: gcc
%if %{with python2}
BuildRequires: python2-devel >= 2.6
@ -111,8 +107,6 @@ This package includes the python 3 version of the module.
%prep
%setup -n %{srcname}-%{srcversion}
%patch0 -p1 -b .sqlite-3.30
# Remove flag for pytest-xdist. (python2-pytest-xdist is a removed dependency.)
# (--max-worker-restart=5 would end the test run after 5 crashing tests.)
sed -i -e's/\(addopts = .*\) --max-worker-restart=5/\1/' setup.cfg
@ -171,6 +165,10 @@ PYTHONPATH=. %{__python3} -m pytest test \
# with python3
%changelog
* Tue Nov 19 2019 Randy Barlow <bowlofeggs@fedoraproject.org> - 1.3.11-1
- Update to 1.3.11 (#1771196).
- https://docs.sqlalchemy.org/en/13/changelog/changelog_13.html#change-1.3.11
* Wed Nov 13 2019 Nils Philippsen <nils@tiptoe.de> - 1.3.10-2
- drop python2-sqlalchemy from F32 on

View File

@ -1 +1 @@
SHA512 (SQLAlchemy-1.3.10.tar.gz) = d4ea7c56b1a2e487f596db2d0968e2312cee2a7a0b68a9a98b5d9439974e79fcd21b7dda4cbdffd5013172ad4bdadf7283cade62b2c26875905fbeb318d0e83b
SHA512 (SQLAlchemy-1.3.11.tar.gz) = c691539db4edd62af749087728dfd424010bfb3ca2cc8503a4b96c1625d059d4c2a748b9a35cc870cc99ca9df61966cce406f9b570b25e55c3632a99b8621e74