Date: Tuesday, March 10, 2020 @ 22:19:11 Author: felixonmars Revision: 593995
archrelease: copy trunk to community-x86_64 Added: python-sqlalchemy/repos/community-x86_64/PKGBUILD (from rev 593994, python-sqlalchemy/trunk/PKGBUILD) python-sqlalchemy/repos/community-x86_64/sqlite-3.30.patch (from rev 593994, 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 | 122 ++++++++++++++++++++++++++-------------------------- sqlite-3.30.patch | 100 +++++++++++++++++++++--------------------- 2 files changed, 111 insertions(+), 111 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-03-10 22:18:57 UTC (rev 593994) +++ PKGBUILD 2020-03-10 22:19:11 UTC (rev 593995) @@ -1,61 +0,0 @@ -# Maintainer: Angel Velasquez <an...@archlinux.org> -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Sébastien Luttringer <se...@aur.archlinux.org> - -pkgbase=python-sqlalchemy -pkgname=('python-sqlalchemy' 'python2-sqlalchemy') -pkgver=1.3.13 -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=('43ed4fe3505dab775996dc4b01ea729069dee3969f72188f130a942212252d97acb721e51e1a974a2756fdd62b8bf2c626a33f6913d585f669154212da3b783a' - '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: Copied: python-sqlalchemy/repos/community-x86_64/PKGBUILD (from rev 593994, python-sqlalchemy/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-03-10 22:19:11 UTC (rev 593995) @@ -0,0 +1,61 @@ +# Maintainer: Angel Velasquez <an...@archlinux.org> +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Sébastien Luttringer <se...@aur.archlinux.org> + +pkgbase=python-sqlalchemy +pkgname=('python-sqlalchemy' 'python2-sqlalchemy') +pkgver=1.3.14 +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=('2312f96c5998087ba4acd55d8011c1162392910c2612ab29e8cd3aa6332310c010ab954f1adef4eba8028846413c313a6a713404a0939c9f08ecdf01683e9cea' + '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 2020-03-10 22:18:57 UTC (rev 593994) +++ sqlite-3.30.patch 2020-03-10 22:19:11 UTC (rev 593995) @@ -1,50 +0,0 @@ -From 8b35ba54ab31aab13a34c360a31d014da1f5c809 Mon Sep 17 00:00:00 2001 -From: Nils Philippsen <n...@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 <n...@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 <n...@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 <n...@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 593994, python-sqlalchemy/trunk/sqlite-3.30.patch) =================================================================== --- sqlite-3.30.patch (rev 0) +++ sqlite-3.30.patch 2020-03-10 22:19:11 UTC (rev 593995) @@ -0,0 +1,50 @@ +From 8b35ba54ab31aab13a34c360a31d014da1f5c809 Mon Sep 17 00:00:00 2001 +From: Nils Philippsen <n...@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 <n...@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 <n...@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 <n...@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):