[arch-commits] Commit in python-peewee/repos (6 files)
Felix Yan
fyan at archlinux.org
Tue Nov 24 16:05:53 UTC 2015
Date: Tuesday, November 24, 2015 @ 17:05:53
Author: fyan
Revision: 147692
archrelease: copy trunk to community-i686, community-x86_64
Added:
python-peewee/repos/community-i686/PKGBUILD
(from rev 147691, python-peewee/trunk/PKGBUILD)
python-peewee/repos/community-i686/skip-json1-tests.patch
(from rev 147691, python-peewee/trunk/skip-json1-tests.patch)
python-peewee/repos/community-x86_64/PKGBUILD
(from rev 147691, python-peewee/trunk/PKGBUILD)
python-peewee/repos/community-x86_64/skip-json1-tests.patch
(from rev 147691, python-peewee/trunk/skip-json1-tests.patch)
Deleted:
python-peewee/repos/community-i686/PKGBUILD
python-peewee/repos/community-x86_64/PKGBUILD
-----------------------------------------+
/PKGBUILD | 130 ++++++++++++++++++++++++++++++
community-i686/PKGBUILD | 59 -------------
community-i686/skip-json1-tests.patch | 36 ++++++++
community-x86_64/PKGBUILD | 59 -------------
community-x86_64/skip-json1-tests.patch | 36 ++++++++
5 files changed, 202 insertions(+), 118 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2015-11-24 16:05:10 UTC (rev 147691)
+++ community-i686/PKGBUILD 2015-11-24 16:05:53 UTC (rev 147692)
@@ -1,59 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Blackleg <blacklg at openaliasbox.org>
-# Contributor: Nidhogg
-# Contributor: juantascon
-
-pkgname=python-peewee
-pkgname=('python-peewee' 'python2-peewee')
-pkgver=2.7.2
-pkgrel=1
-pkgdesc="a little orm"
-url="https://pypi.python.org/pypi/peewee/"
-arch=('i686' 'x86_64')
-license=('MIT')
-makedepends=('python-setuptools' 'python2-setuptools' 'cython' 'cython2' 'git')
-checkdepends=('python-apsw' 'python2-apsw' 'python-flask' 'python2-flask')
-source=("git+https://github.com/coleifer/peewee.git#tag=$pkgver")
-sha256sums=('SKIP')
-
-prepare() {
- cp -a peewee{,-py2}
-}
-
-build() {
- cd "$srcdir/peewee"
- python setup.py build
-
- cd "$srcdir/peewee-py2"
- python2 setup.py build
-}
-
-check() {
- cd "$srcdir/peewee"
- python runtests.py -a
-
- cd "$srcdir/peewee-py2"
- python2 runtests.py -a
-}
-
-package_python-peewee() {
- depends=('python')
- optdepends=('python-psycopg2: for PostgreSQL database support'
- 'mysql-python: for MySQL database support')
-
- cd "$srcdir/peewee"
- python setup.py install --root="$pkgdir" --optimize=1
- install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-package_python2-peewee() {
- depends=('python2')
- optdepends=('python2-psycopg2: for PostgreSQL database support')
-
- cd "$srcdir/peewee-py2"
- python2 setup.py install --root="$pkgdir" --optimize=1
- install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-
- mv "$pkgdir/usr/bin/"pwiz{,2}.py
-}
Copied: python-peewee/repos/community-i686/PKGBUILD (from rev 147691, python-peewee/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2015-11-24 16:05:53 UTC (rev 147692)
@@ -0,0 +1,65 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Blackleg <blacklg at openaliasbox.org>
+# Contributor: Nidhogg
+# Contributor: juantascon
+
+pkgname=python-peewee
+pkgname=('python-peewee' 'python2-peewee')
+pkgver=2.7.3
+pkgrel=1
+pkgdesc="a little orm"
+url="https://pypi.python.org/pypi/peewee/"
+arch=('i686' 'x86_64')
+license=('MIT')
+makedepends=('python-setuptools' 'python2-setuptools' 'cython' 'cython2' 'git')
+checkdepends=('python-apsw' 'python2-apsw' 'python-flask' 'python2-flask'
+ 'python2-pysqlite') #'python-psycopg2' 'python2-psycopg2')
+source=("git+https://github.com/coleifer/peewee.git#tag=$pkgver"
+ skip-json1-tests.patch)
+sha256sums=('SKIP'
+ '6009dd05b2ce5e203bc2a2186a00aace1384cac830c8a6b71436e2c5586fb8a2')
+
+prepare() {
+ # https://github.com/coleifer/peewee/issues/767
+ (cd peewee; patch -p1 -i ../skip-json1-tests.patch)
+
+ cp -a peewee{,-py2}
+}
+
+build() {
+ cd "$srcdir/peewee"
+ python setup.py build
+
+ cd "$srcdir/peewee-py2"
+ python2 setup.py build
+}
+
+check() {
+ cd "$srcdir/peewee"
+ python runtests.py -a
+
+ cd "$srcdir/peewee-py2"
+ python2 runtests.py -a
+}
+
+package_python-peewee() {
+ depends=('python')
+ optdepends=('python-psycopg2: for PostgreSQL database support'
+ 'mysql-python: for MySQL database support')
+
+ cd "$srcdir/peewee"
+ python setup.py install --root="$pkgdir" --optimize=1
+ install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+package_python2-peewee() {
+ depends=('python2')
+ optdepends=('python2-psycopg2: for PostgreSQL database support')
+
+ cd "$srcdir/peewee-py2"
+ python2 setup.py install --root="$pkgdir" --optimize=1
+ install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+ mv "$pkgdir/usr/bin/"pwiz{,2}.py
+}
Copied: python-peewee/repos/community-i686/skip-json1-tests.patch (from rev 147691, python-peewee/trunk/skip-json1-tests.patch)
===================================================================
--- community-i686/skip-json1-tests.patch (rev 0)
+++ community-i686/skip-json1-tests.patch 2015-11-24 16:05:53 UTC (rev 147692)
@@ -0,0 +1,36 @@
+From d6e4b1f9b0e63f523f5997b7f624c71ff7d344ff Mon Sep 17 00:00:00 2001
+From: Charles Leifer <coleifer at gmail.com>
+Date: Sat, 21 Nov 2015 20:20:58 -0600
+Subject: [PATCH] Check json1 installed, fixes #767
+
+---
+ playhouse/tests/test_sqlite_ext.py | 16 +++++++++++++++-
+ 1 file changed, 15 insertions(+), 1 deletion(-)
+
+diff --git a/playhouse/tests/test_sqlite_ext.py b/playhouse/tests/test_sqlite_ext.py
+index 634b644..e5c76d2 100644
+--- a/playhouse/tests/test_sqlite_ext.py
++++ b/playhouse/tests/test_sqlite_ext.py
+@@ -161,7 +161,21 @@ class TestVirtualModelChild(TestVirtualModel):
+ pass
+
+
+- at skip_unless(lambda: sqlite3.sqlite_version_info >= (3, 9, 0))
++def json_installed():
++ if sqlite3.sqlite_version_info < (3, 9, 0):
++ return False
++ # Test in-memory DB to determine if the FTS5 extension is installed.
++ tmp_db = sqlite3.connect(':memory:')
++ try:
++ tmp_db.execute('select json(?)', (1337,))
++ except:
++ return False
++ finally:
++ tmp_db.close()
++ return True
++
++
++ at skip_unless(json_installed)
+ class TestJSONField(ModelTestCase):
+ requires = [
+ APIData,
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2015-11-24 16:05:10 UTC (rev 147691)
+++ community-x86_64/PKGBUILD 2015-11-24 16:05:53 UTC (rev 147692)
@@ -1,59 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Blackleg <blacklg at openaliasbox.org>
-# Contributor: Nidhogg
-# Contributor: juantascon
-
-pkgname=python-peewee
-pkgname=('python-peewee' 'python2-peewee')
-pkgver=2.7.2
-pkgrel=1
-pkgdesc="a little orm"
-url="https://pypi.python.org/pypi/peewee/"
-arch=('i686' 'x86_64')
-license=('MIT')
-makedepends=('python-setuptools' 'python2-setuptools' 'cython' 'cython2' 'git')
-checkdepends=('python-apsw' 'python2-apsw' 'python-flask' 'python2-flask')
-source=("git+https://github.com/coleifer/peewee.git#tag=$pkgver")
-sha256sums=('SKIP')
-
-prepare() {
- cp -a peewee{,-py2}
-}
-
-build() {
- cd "$srcdir/peewee"
- python setup.py build
-
- cd "$srcdir/peewee-py2"
- python2 setup.py build
-}
-
-check() {
- cd "$srcdir/peewee"
- python runtests.py -a
-
- cd "$srcdir/peewee-py2"
- python2 runtests.py -a
-}
-
-package_python-peewee() {
- depends=('python')
- optdepends=('python-psycopg2: for PostgreSQL database support'
- 'mysql-python: for MySQL database support')
-
- cd "$srcdir/peewee"
- python setup.py install --root="$pkgdir" --optimize=1
- install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-package_python2-peewee() {
- depends=('python2')
- optdepends=('python2-psycopg2: for PostgreSQL database support')
-
- cd "$srcdir/peewee-py2"
- python2 setup.py install --root="$pkgdir" --optimize=1
- install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-
- mv "$pkgdir/usr/bin/"pwiz{,2}.py
-}
Copied: python-peewee/repos/community-x86_64/PKGBUILD (from rev 147691, python-peewee/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2015-11-24 16:05:53 UTC (rev 147692)
@@ -0,0 +1,65 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Blackleg <blacklg at openaliasbox.org>
+# Contributor: Nidhogg
+# Contributor: juantascon
+
+pkgname=python-peewee
+pkgname=('python-peewee' 'python2-peewee')
+pkgver=2.7.3
+pkgrel=1
+pkgdesc="a little orm"
+url="https://pypi.python.org/pypi/peewee/"
+arch=('i686' 'x86_64')
+license=('MIT')
+makedepends=('python-setuptools' 'python2-setuptools' 'cython' 'cython2' 'git')
+checkdepends=('python-apsw' 'python2-apsw' 'python-flask' 'python2-flask'
+ 'python2-pysqlite') #'python-psycopg2' 'python2-psycopg2')
+source=("git+https://github.com/coleifer/peewee.git#tag=$pkgver"
+ skip-json1-tests.patch)
+sha256sums=('SKIP'
+ '6009dd05b2ce5e203bc2a2186a00aace1384cac830c8a6b71436e2c5586fb8a2')
+
+prepare() {
+ # https://github.com/coleifer/peewee/issues/767
+ (cd peewee; patch -p1 -i ../skip-json1-tests.patch)
+
+ cp -a peewee{,-py2}
+}
+
+build() {
+ cd "$srcdir/peewee"
+ python setup.py build
+
+ cd "$srcdir/peewee-py2"
+ python2 setup.py build
+}
+
+check() {
+ cd "$srcdir/peewee"
+ python runtests.py -a
+
+ cd "$srcdir/peewee-py2"
+ python2 runtests.py -a
+}
+
+package_python-peewee() {
+ depends=('python')
+ optdepends=('python-psycopg2: for PostgreSQL database support'
+ 'mysql-python: for MySQL database support')
+
+ cd "$srcdir/peewee"
+ python setup.py install --root="$pkgdir" --optimize=1
+ install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+package_python2-peewee() {
+ depends=('python2')
+ optdepends=('python2-psycopg2: for PostgreSQL database support')
+
+ cd "$srcdir/peewee-py2"
+ python2 setup.py install --root="$pkgdir" --optimize=1
+ install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+ mv "$pkgdir/usr/bin/"pwiz{,2}.py
+}
Copied: python-peewee/repos/community-x86_64/skip-json1-tests.patch (from rev 147691, python-peewee/trunk/skip-json1-tests.patch)
===================================================================
--- community-x86_64/skip-json1-tests.patch (rev 0)
+++ community-x86_64/skip-json1-tests.patch 2015-11-24 16:05:53 UTC (rev 147692)
@@ -0,0 +1,36 @@
+From d6e4b1f9b0e63f523f5997b7f624c71ff7d344ff Mon Sep 17 00:00:00 2001
+From: Charles Leifer <coleifer at gmail.com>
+Date: Sat, 21 Nov 2015 20:20:58 -0600
+Subject: [PATCH] Check json1 installed, fixes #767
+
+---
+ playhouse/tests/test_sqlite_ext.py | 16 +++++++++++++++-
+ 1 file changed, 15 insertions(+), 1 deletion(-)
+
+diff --git a/playhouse/tests/test_sqlite_ext.py b/playhouse/tests/test_sqlite_ext.py
+index 634b644..e5c76d2 100644
+--- a/playhouse/tests/test_sqlite_ext.py
++++ b/playhouse/tests/test_sqlite_ext.py
+@@ -161,7 +161,21 @@ class TestVirtualModelChild(TestVirtualModel):
+ pass
+
+
+- at skip_unless(lambda: sqlite3.sqlite_version_info >= (3, 9, 0))
++def json_installed():
++ if sqlite3.sqlite_version_info < (3, 9, 0):
++ return False
++ # Test in-memory DB to determine if the FTS5 extension is installed.
++ tmp_db = sqlite3.connect(':memory:')
++ try:
++ tmp_db.execute('select json(?)', (1337,))
++ except:
++ return False
++ finally:
++ tmp_db.close()
++ return True
++
++
++ at skip_unless(json_installed)
+ class TestJSONField(ModelTestCase):
+ requires = [
+ APIData,
More information about the arch-commits
mailing list