[arch-commits] Commit in python-sqlalchemy/trunk (PKGBUILD sqlite-3.30.patch)

[Evangelos Foutras]

    Date: Thursday, October 31, 2019 @ 19:22:13
  Author: foutrelis
Revision: 521693

Adjust tests for sqlite 3.30

Added:
  python-sqlalchemy/trunk/sqlite-3.30.patch
Modified:
  python-sqlalchemy/trunk/PKGBUILD

-------------------+
 PKGBUILD          |    9 +++++++--
 sqlite-3.30.patch |   50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-10-31 19:17:46 UTC (rev 521692)
+++ PKGBUILD	2019-10-31 19:22:13 UTC (rev 521693)
@@ -11,12 +11,17 @@
 license=('MIT')
 makedepends=('python-setuptools' 'python2-setuptools')
 checkdepends=('python-pytest-runner' 'python2-pytest-runner' 'python-pytest-xdist' 'python2-pytest-xdist' 'python-mock' 'python2-mock')
-source=("https://pypi.io/packages/source/S/SQLAlchemy/SQLAlchemy-$pkgver.tar.gz"{,.asc})
+source=("https://pypi.io/packages/source/S/SQLAlchemy/SQLAlchemy-$pkgver.tar.gz"{,.asc}
+        'sqlite-3.30.patch')
 validpgpkeys=('83AF7ACE251C13E6BB7DEFBD330239C1C4DAFEE1')
 sha512sums=('7c4b7fec7cb754c33ff693df6b1d429f9756e3446b56d7244a0e96232e9ca2557064055c40c65119db99b17579f178a169bb07ed83c0f353027bc18ac8247c2a'
-            'SKIP')
+            'SKIP'
+            '8760bd3a603639d84a2664114a982ba5fd41c9fdb31157fae10e602d9fd9b83a55d67a292a137ea67aaeb90dd096c59dc8dd65f71aef5f2de04bed16c6d95b53')
 
 prepare() {
+  # https://github.com/sqlalchemy/sqlalchemy/pull/4921
+  patch -Np1 -d SQLAlchemy-$pkgver <sqlite-3.30.patch
+
   cp -a SQLAlchemy-$pkgver SQLAlchemy2-$pkgver
 }
 

Added: sqlite-3.30.patch
===================================================================
--- sqlite-3.30.patch	                        (rev 0)
+++ sqlite-3.30.patch	2019-10-31 19:22:13 UTC (rev 521693)
@@ -0,0 +1,50 @@
+From 8b35ba54ab31aab13a34c360a31d014da1f5c809 Mon Sep 17 00:00:00 2001
+From: Nils Philippsen <nils at 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 at 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 @@ 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):
+
+From e18534a9045786efdaf4963515222838c62e0300 Mon Sep 17 00:00:00 2001
+From: Nils Philippsen <nils at 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 at 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 @@ 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):