[arch-commits] Commit in python-sqlalchemy/repos/community-x86_64 (4 files)
Felix Yan
felixonmars at archlinux.org
Fri Nov 15 08:39:12 UTC 2019
Date: Friday, November 15, 2019 @ 08:39:11
Author: felixonmars
Revision: 528965
archrelease: copy trunk to community-x86_64
Added:
python-sqlalchemy/repos/community-x86_64/PKGBUILD
(from rev 528964, python-sqlalchemy/trunk/PKGBUILD)
python-sqlalchemy/repos/community-x86_64/sqlite-3.30.patch
(from rev 528964, python-sqlalchemy/trunk/sqlite-3.30.patch)
Deleted:
python-sqlalchemy/repos/community-x86_64/PKGBUILD
python-sqlalchemy/repos/community-x86_64/sqlite-3.30.patch
-------------------+
PKGBUILD | 127 ++++++++++++++++++++++++----------------------------
sqlite-3.30.patch | 100 ++++++++++++++++++++--------------------
2 files changed, 111 insertions(+), 116 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-11-15 08:38:53 UTC (rev 528964)
+++ PKGBUILD 2019-11-15 08:39:11 UTC (rev 528965)
@@ -1,66 +0,0 @@
-# Maintainer: Angel Velasquez <angvp at archlinux.org>
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Sébastien Luttringer <seblu at aur.archlinux.org>
-
-pkgbase=python-sqlalchemy
-pkgname=('python-sqlalchemy' 'python2-sqlalchemy')
-pkgver=1.3.9
-pkgrel=3
-arch=('x86_64') # python2 package contain .so
-url="https://www.sqlalchemy.org/"
-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}
- 'sqlite-3.30.patch')
-validpgpkeys=('83AF7ACE251C13E6BB7DEFBD330239C1C4DAFEE1')
-sha512sums=('7c4b7fec7cb754c33ff693df6b1d429f9756e3446b56d7244a0e96232e9ca2557064055c40c65119db99b17579f178a169bb07ed83c0f353027bc18ac8247c2a'
- '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
-}
-
-build() {
- cd "$srcdir"/SQLAlchemy-$pkgver
- python setup.py build
-
- cd "$srcdir"/SQLAlchemy2-$pkgver
- python2 setup.py build
-}
-
-check() {
- cd "$srcdir"/SQLAlchemy-$pkgver
- python setup.py pytest
-
- cd "$srcdir"/SQLAlchemy2-$pkgver
- python2 setup.py pytest
-}
-
-package_python-sqlalchemy() {
- pkgdesc='Python SQL toolkit and Object Relational Mapper'
- depends=('python')
- optdepends=('python-psycopg2: connect to PostgreSQL database')
-
- cd SQLAlchemy-$pkgver
- python setup.py install --root="${pkgdir}"
- install -D -m644 LICENSE \
- "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-package_python2-sqlalchemy() {
- pkgdesc='Python 2 SQL toolkit and Object Relational Mapper'
- depends=('python2')
- optdepends=('python2-psycopg2: connect to PostgreSQL database')
-
- cd SQLAlchemy2-$pkgver
- python2 setup.py install --root="$pkgdir"
- install -D -m644 LICENSE \
- "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-# vim:set ts=2 sw=2 ft=sh et:
Copied: python-sqlalchemy/repos/community-x86_64/PKGBUILD (from rev 528964, python-sqlalchemy/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-11-15 08:39:11 UTC (rev 528965)
@@ -0,0 +1,61 @@
+# Maintainer: Angel Velasquez <angvp at archlinux.org>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Sébastien Luttringer <seblu at aur.archlinux.org>
+
+pkgbase=python-sqlalchemy
+pkgname=('python-sqlalchemy' 'python2-sqlalchemy')
+pkgver=1.3.11
+pkgrel=1
+arch=('x86_64') # python2 package contain .so
+url="https://www.sqlalchemy.org/"
+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})
+validpgpkeys=('83AF7ACE251C13E6BB7DEFBD330239C1C4DAFEE1')
+sha512sums=('c691539db4edd62af749087728dfd424010bfb3ca2cc8503a4b96c1625d059d4c2a748b9a35cc870cc99ca9df61966cce406f9b570b25e55c3632a99b8621e74'
+ 'SKIP')
+
+prepare() {
+ cp -a SQLAlchemy-$pkgver SQLAlchemy2-$pkgver
+}
+
+build() {
+ cd "$srcdir"/SQLAlchemy-$pkgver
+ python setup.py build
+
+ cd "$srcdir"/SQLAlchemy2-$pkgver
+ python2 setup.py build
+}
+
+check() {
+ cd "$srcdir"/SQLAlchemy-$pkgver
+ python setup.py pytest
+
+ cd "$srcdir"/SQLAlchemy2-$pkgver
+ python2 setup.py pytest
+}
+
+package_python-sqlalchemy() {
+ pkgdesc='Python SQL toolkit and Object Relational Mapper'
+ depends=('python')
+ optdepends=('python-psycopg2: connect to PostgreSQL database')
+
+ cd SQLAlchemy-$pkgver
+ python setup.py install --root="${pkgdir}"
+ install -D -m644 LICENSE \
+ "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+package_python2-sqlalchemy() {
+ pkgdesc='Python 2 SQL toolkit and Object Relational Mapper'
+ depends=('python2')
+ optdepends=('python2-psycopg2: connect to PostgreSQL database')
+
+ cd SQLAlchemy2-$pkgver
+ python2 setup.py install --root="$pkgdir"
+ install -D -m644 LICENSE \
+ "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
Deleted: sqlite-3.30.patch
===================================================================
--- sqlite-3.30.patch 2019-11-15 08:38:53 UTC (rev 528964)
+++ sqlite-3.30.patch 2019-11-15 08:39:11 UTC (rev 528965)
@@ -1,50 +0,0 @@
-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):
Copied: python-sqlalchemy/repos/community-x86_64/sqlite-3.30.patch (from rev 528964, python-sqlalchemy/trunk/sqlite-3.30.patch)
===================================================================
--- sqlite-3.30.patch (rev 0)
+++ sqlite-3.30.patch 2019-11-15 08:39:11 UTC (rev 528965)
@@ -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):
More information about the arch-commits
mailing list