[arch-commits] Commit in python-jsonpickle/trunk (2 files)

[Felix Yan]

    Date: Saturday, May 23, 2020 @ 02:48:35
  Author: felixonmars
Revision: 631783

upgpkg: python-jsonpickle 1.4-1

Modified:
  python-jsonpickle/trunk/PKGBUILD
Deleted:
  python-jsonpickle/trunk/jsonpickle-python-3.8.patch

-----------------------------+
 PKGBUILD                    |   27 +++++++++++++--------------
 jsonpickle-python-3.8.patch |   14 --------------
 2 files changed, 13 insertions(+), 28 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-23 02:48:32 UTC (rev 631782)
+++ PKGBUILD	2020-05-23 02:48:35 UTC (rev 631783)
@@ -1,39 +1,38 @@
 # Maintainer: Felix Yan <felixonmars at archlinux.org>
 
 pkgname=python-jsonpickle
-pkgver=1.3
+pkgver=1.4
 pkgrel=1
 arch=('any')
 pkgdesc="Python library for serializing any arbitrary object graph into JSON"
 url="https://jsonpickle.github.io/"
 depends=('python')
-makedepends=('python-setuptools')
-checkdepends=('python-nose-show-skipped' 'python-numpy' 'python-feedparser' 'python-coverage'
-              'python-simplejson' 'python-pymongo' 'python-ujson')
+makedepends=('python-setuptools-scm')
+checkdepends=('python-pytest-black' 'python-pytest-cov' 'python-numpy' 'python-feedparser'
+              'python-coverage' 'python-simplejson' 'python-pymongo' 'python-ujson' 'python-pandas')
 license=('BSD')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/jsonpickle/jsonpickle/archive/v$pkgver.tar.gz"
-         jsonpickle-python-3.8.patch)
-sha512sums=('569c428687f71c8b7b6fa043d573b2454e351fe5564e1934b92e33ae8c50a952ad10daabf633436ae0ea3a5ff03f07a4a95dc17be7b587e9178f775c6b2d7931'
-            'a07bda01508bbbe36f31c9f3be46507bff0d3f81cfb0df5eb6702690db1ba5d853aab1065b7a79e89bc9c8abaad01dd9fc6f71e59194f819addf99b0c28f0c1b')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/jsonpickle/jsonpickle/archive/v$pkgver.tar.gz")
+sha512sums=('0f322cf498257be0e289938de05e90da19ab10c07cd1d4fb512b57ab19e049cb6182a951f7b8a6440d5af4ed4f558ada6c059e506206a564a750c98f81cb35d3')
 
+export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver
+
 prepare() {
   cd jsonpickle-$pkgver
-# Fix tests with python 3.8 - file descriptors no longer have __getstate__
-  patch -p1 -i ../jsonpickle-python-3.8.patch
+  sed -i 's/--flake8//' pytest.ini
 }
 
 build() {
-  cd "$srcdir"/jsonpickle-$pkgver
+  cd jsonpickle-$pkgver
   python setup.py build
 }
 
 check() {
-  cd "$srcdir"/jsonpickle-$pkgver
-  nosetests3 --show-skipped
+  cd jsonpickle-$pkgver
+  pytest
 }
 
 package() {
   cd jsonpickle-$pkgver
   python setup.py install --root="$pkgdir" --optimize=1
-  install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
+  install -Dm644 LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname/
 }

Deleted: jsonpickle-python-3.8.patch
===================================================================
--- jsonpickle-python-3.8.patch	2020-05-23 02:48:32 UTC (rev 631782)
+++ jsonpickle-python-3.8.patch	2020-05-23 02:48:35 UTC (rev 631783)
@@ -1,14 +0,0 @@
-diff --git a/jsonpickle/pickler.py b/jsonpickle/pickler.py
-index ce64592..62ba575 100644
---- a/jsonpickle/pickler.py
-+++ b/jsonpickle/pickler.py
-@@ -462,6 +462,9 @@ class Pickler(object):
-             if has_getinitargs:
-                 data[tags.INITARGS] = self._flatten(obj.__getinitargs__())
- 
-+        if type(obj).__name__ == 'TextIOWrapper':
-+            return None
-+
-         if has_getstate:
-             try:
-                 state = obj.__getstate__()