[arch-commits] Commit in python-jsonpatch/repos/community-any (3 files)

Felix Yan felixonmars at archlinux.org
Sat Jan 14 03:19:03 UTC 2017


    Date: Saturday, January 14, 2017 @ 03:18:45
  Author: felixonmars
Revision: 207286

archrelease: copy trunk to community-any

Added:
  python-jsonpatch/repos/community-any/PKGBUILD
    (from rev 207285, python-jsonpatch/trunk/PKGBUILD)
Deleted:
  python-jsonpatch/repos/community-any/PKGBUILD
  python-jsonpatch/repos/community-any/python3.6.patch

-----------------+
 PKGBUILD        |  125 ++++++++++++++++++++++++++----------------------------
 python3.6.patch |   29 ------------
 2 files changed, 61 insertions(+), 93 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2017-01-14 03:18:23 UTC (rev 207285)
+++ PKGBUILD	2017-01-14 03:18:45 UTC (rev 207286)
@@ -1,64 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Daniel Wallace <danielwallace at gtmanfred dot com>
-# Contributor: Limao Luo <luolimao+AUR at gmail.com>
-
-pkgbase=python-jsonpatch
-_pkgname=jsonpatch
-pkgname=(python-jsonpatch python2-jsonpatch)
-pkgver=1.14
-pkgrel=2
-pkgdesc="An implementation of the JSON Patch format"
-arch=("any")
-url="https://github.com/stefankoegl/python-json-patch"
-license=("BSD")
-makedepends=("python-setuptools" "python2-setuptools" "python-jsonpointer" "python2-jsonpointer"
-             "python-pypandoc" "python2-pypandoc" "git")
-checkdepends=('python-coverage' 'python2-coverage')
-source=("git+https://github.com/stefankoegl/python-json-patch.git#tag=v$pkgver"
-        python3.6.patch)
-sha512sums=('SKIP'
-            'e6f536bf89002cbdce63828fbc9f37690cf23fddad3b300258766b18bd735fc9ac22f6cd3f8ecf59e79206721ca31b2867ab1518efb578d86f485a2d63b07fcc')
-
-prepare(){
-  (cd python-json-patch; patch -p1 -i ../python3.6.patch)
-
-  cp -a python-json-patch{,-py2}
-  find python-json-patch-py2 -name \*.py -exec sed -i '1s/python$/&2/' {} +
-}
-
-build() {
-  cd "$srcdir"/python-json-patch
-  python setup.py build
-
-  cd "$srcdir"/python-json-patch-py2
-  python2 setup.py build
-}
-
-check() {
-  cd "$srcdir"/python-json-patch
-  coverage run --source=jsonpatch tests.py
-
-  cd "$srcdir"/python-json-patch-py2
-  coverage2 run --source=jsonpatch tests.py
-}
-
-package_python-jsonpatch() {
-  depends=("python-jsonpointer")
-
-  cd "$srcdir"/python-json-patch
-
-  install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
-  python setup.py install --prefix=/usr --root="$pkgdir"
-}
-package_python2-jsonpatch() {
-  depends=("python2-jsonpointer")
-
-  cd "$srcdir"/python-json-patch-py2
-
-  install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
-  python2 setup.py install --prefix=/usr --root="$pkgdir"
-  for _bin in "$pkgdir"/usr/bin/*; do
-    mv "$_bin"{,2}
-  done
-}

Copied: python-jsonpatch/repos/community-any/PKGBUILD (from rev 207285, python-jsonpatch/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2017-01-14 03:18:45 UTC (rev 207286)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Daniel Wallace <danielwallace at gtmanfred dot com>
+# Contributor: Limao Luo <luolimao+AUR at gmail.com>
+
+pkgbase=python-jsonpatch
+_pkgname=jsonpatch
+pkgname=(python-jsonpatch python2-jsonpatch)
+pkgver=1.15
+_commit=27f1f987e0c9d101a8dc01cc322d5f31ca89d074
+pkgrel=1
+pkgdesc="An implementation of the JSON Patch format"
+arch=("any")
+url="https://github.com/stefankoegl/python-json-patch"
+license=("BSD")
+makedepends=("python-setuptools" "python2-setuptools" "python-jsonpointer" "python2-jsonpointer"
+             "python-pypandoc" "python2-pypandoc" "git")
+checkdepends=('python-coverage' 'python2-coverage')
+source=("git+https://github.com/stefankoegl/python-json-patch.git#commit=$_commit")
+sha512sums=('SKIP')
+
+prepare(){
+  cp -a python-json-patch{,-py2}
+  find python-json-patch-py2 -name \*.py -exec sed -i '1s/python$/&2/' {} +
+}
+
+build() {
+  cd "$srcdir"/python-json-patch
+  python setup.py build
+
+  cd "$srcdir"/python-json-patch-py2
+  python2 setup.py build
+}
+
+check() {
+  cd "$srcdir"/python-json-patch
+  coverage run --source=jsonpatch tests.py
+
+  cd "$srcdir"/python-json-patch-py2
+  coverage2 run --source=jsonpatch tests.py
+}
+
+package_python-jsonpatch() {
+  depends=("python-jsonpointer")
+
+  cd "$srcdir"/python-json-patch
+
+  install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
+  python setup.py install --prefix=/usr --root="$pkgdir"
+}
+package_python2-jsonpatch() {
+  depends=("python2-jsonpointer")
+
+  cd "$srcdir"/python-json-patch-py2
+
+  install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
+  python2 setup.py install --prefix=/usr --root="$pkgdir"
+  for _bin in "$pkgdir"/usr/bin/*; do
+    mv "$_bin"{,2}
+  done
+}

Deleted: python3.6.patch
===================================================================
--- python3.6.patch	2017-01-14 03:18:23 UTC (rev 207285)
+++ python3.6.patch	2017-01-14 03:18:45 UTC (rev 207286)
@@ -1,29 +0,0 @@
-From d6e9a0047bad780b53151f572ea257f1cb6ebe41 Mon Sep 17 00:00:00 2001
-From: Victor Stinner <vstinner at redhat.com>
-Date: Wed, 29 Jun 2016 11:13:00 +0200
-Subject: [PATCH] Use inspect.signature() on Python 3
-
-The inspect.getargspec() function has been deprecated in Python 3:
-https://docs.python.org/3/library/inspect.html#inspect.getargspec
----
- jsonpatch.py | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/jsonpatch.py b/jsonpatch.py
-index 32508e2..3c83f61 100644
---- a/jsonpatch.py
-+++ b/jsonpatch.py
-@@ -105,8 +105,11 @@ def get_loadjson():
-     function with object_pairs_hook set to multidict for Python versions that
-     support the parameter. """
- 
--    argspec = inspect.getargspec(json.load)
--    if 'object_pairs_hook' not in argspec.args:
-+    if sys.version_info >= (3, 3):
-+        args = inspect.signature(json.load).parameters
-+    else:
-+        args = inspect.getargspec(json.load).args
-+    if 'object_pairs_hook' not in args:
-         return json.load
- 
-     return functools.partial(json.load, object_pairs_hook=multidict)



More information about the arch-commits mailing list