Date: Friday, November 1, 2019 @ 11:20:15 Author: arojas Revision: 521767
Fix tests with python 3.8, drop python2 Added: python-jsonpickle/trunk/jsonpickle-python-3.8.patch Modified: python-jsonpickle/trunk/PKGBUILD -----------------------------+ PKGBUILD | 40 +++++++++++++--------------------------- jsonpickle-python-3.8.patch | 14 ++++++++++++++ 2 files changed, 27 insertions(+), 27 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-11-01 09:27:27 UTC (rev 521766) +++ PKGBUILD 2019-11-01 11:20:15 UTC (rev 521767) @@ -1,53 +1,39 @@ # Maintainer: Felix Yan <[email protected]> -pkgbase=python-jsonpickle -pkgname=(python-jsonpickle python2-jsonpickle) +pkgname=python-jsonpickle pkgver=1.2 pkgrel=2 arch=('any') pkgdesc="Python library for serializing any arbitrary object graph into JSON" url="https://jsonpickle.github.io/"; -makedepends=('python-setuptools' 'python2-setuptools') -checkdepends=('python-nose-show-skipped' 'python2-nose-show-skipped' 'python-numpy' 'python2-numpy' - 'python-feedparser' 'python2-feedparser' 'python-coverage' 'python2-coverage' 'python2-enum34' - 'python-simplejson' 'python2-simplejson' 'python-pymongo' 'python2-pymongo' 'python-ujson' - 'python2-ujson') +depends=('python') +makedepends=('python-setuptools') +checkdepends=('python-nose-show-skipped' 'python-numpy' 'python-feedparser' 'python-coverage' + 'python-simplejson' 'python-pymongo' 'python-ujson') license=('BSD') -source=("$pkgbase-$pkgver.tar.gz::https://github.com/jsonpickle/jsonpickle/archive/v$pkgver.tar.gz";) -sha512sums=('32bcb3df5d2833a52e52d27f6594124119c33f2ad7c111074da4670711f8651c208f4bb1ec826752044b3b2d19053860679d124d9a81f9e303d1377f1e3900c0') +source=("$pkgname-$pkgver.tar.gz::https://github.com/jsonpickle/jsonpickle/archive/v$pkgver.tar.gz"; + jsonpickle-python-3.8.patch) +sha512sums=('32bcb3df5d2833a52e52d27f6594124119c33f2ad7c111074da4670711f8651c208f4bb1ec826752044b3b2d19053860679d124d9a81f9e303d1377f1e3900c0' + 'a07bda01508bbbe36f31c9f3be46507bff0d3f81cfb0df5eb6702690db1ba5d853aab1065b7a79e89bc9c8abaad01dd9fc6f71e59194f819addf99b0c28f0c1b') prepare() { - cp -a jsonpickle-$pkgver{,-py2} + cd jsonpickle-$pkgver +# Fix tests with python 3.8 - file descriptors no longer have __getstate__ + patch -p1 -i ../jsonpickle-python-3.8.patch } build() { cd "$srcdir"/jsonpickle-$pkgver python setup.py build - - cd "$srcdir"/jsonpickle-$pkgver-py2 - python2 setup.py build } check() { cd "$srcdir"/jsonpickle-$pkgver nosetests3 --show-skipped - - cd "$srcdir"/jsonpickle-$pkgver-py2 - nosetests2 --show-skipped } -package_python-jsonpickle() { - depends=('python') - +package() { cd jsonpickle-$pkgver python setup.py install --root="$pkgdir" --optimize=1 install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } - -package_python2-jsonpickle() { - depends=('python2') - - cd jsonpickle-$pkgver-py2 - python2 setup.py install --root="$pkgdir" --optimize=1 - install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING -} Added: jsonpickle-python-3.8.patch =================================================================== --- jsonpickle-python-3.8.patch (rev 0) +++ jsonpickle-python-3.8.patch 2019-11-01 11:20:15 UTC (rev 521767) @@ -0,0 +1,14 @@ +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__()
