[arch-commits] Commit in python-peewee/trunk (PKGBUILD skip-json1-tests.patch)

[Felix Yan]

    Date: Friday, December 4, 2015 @ 09:37:39
  Author: fyan
Revision: 148334

upgpkg: python-peewee 2.7.4-1

Modified:
  python-peewee/trunk/PKGBUILD
Deleted:
  python-peewee/trunk/skip-json1-tests.patch

------------------------+
 PKGBUILD               |   11 +++--------
 skip-json1-tests.patch |   36 ------------------------------------
 2 files changed, 3 insertions(+), 44 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-12-04 08:04:39 UTC (rev 148333)
+++ PKGBUILD	2015-12-04 08:37:39 UTC (rev 148334)
@@ -6,7 +6,7 @@
 
 pkgname=python-peewee
 pkgname=('python-peewee' 'python2-peewee')
-pkgver=2.7.3
+pkgver=2.7.4
 pkgrel=1
 pkgdesc="a little orm"
 url="https://pypi.python.org/pypi/peewee/"
@@ -15,15 +15,10 @@
 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')
+source=("git+https://github.com/coleifer/peewee.git#tag=$pkgver")
+sha256sums=('SKIP')
 
 prepare() {
-  # https://github.com/coleifer/peewee/issues/767
-  (cd peewee; patch -p1 -i ../skip-json1-tests.patch)
-
   cp -a peewee{,-py2}
 }
 

Deleted: skip-json1-tests.patch
===================================================================
--- skip-json1-tests.patch	2015-12-04 08:04:39 UTC (rev 148333)
+++ skip-json1-tests.patch	2015-12-04 08:37:39 UTC (rev 148334)
@@ -1,36 +0,0 @@
-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,