diff options
| -rw-r--r-- | .SRCINFO | 28 | ||||
| -rw-r--r-- | PKGBUILD | 44 | ||||
| -rw-r--r-- | setup.py.patch | 42 |
3 files changed, 82 insertions, 32 deletions
@@ -1,21 +1,21 @@ pkgbase = pyutil - pkgdesc = general-purpose python library (used by tahoe-lafs) - pkgver = 3.3.0 + pkgdesc = General-purpose python library (used by tahoe-lafs) + pkgver = 3.3.6 pkgrel = 1 - url = https://pypi.python.org/pypi/pyutil + url = https://pypi.org/project/pyutil arch = any license = GPL2 - makedepends = python2-setuptools + makedepends = python-build + makedepends = python-installer makedepends = python-setuptools - source = https://files.pythonhosted.org/packages/source/p/pyutil/pyutil-3.3.0.tar.gz - sha256sums = 8c4d4bf668c559186389bb9bce99e4b1b871c09ba252a756ccaacd2b8f401848 - -pkgname = python2-pyutil - depends = python2-simplejson - depends = python2-zbase32 - replaces = pyutil + makedepends = python-wheel + makedepends = python-versioneer + depends = python + optdepends = python-simplejson: jsonutil support + optdepends = python-zbase32: randcookie support + source = python-pyutil-3.3.6.tar.gz::https://files.pythonhosted.org/packages/source/p/pyutil/pyutil-3.3.6.tar.gz + source = setup.py.patch + sha256sums = 5dc3d6bb9c5bababb5d0b773e094045d75712e8b34af2d29b0e28602668267c0 + sha256sums = c04d9474203ff677a0a23818d1d78eb7564f51f99dfac4ebf512170b5fdf7004 pkgname = python-pyutil - depends = python-simplejson - depends = python-zbase32 - @@ -1,30 +1,38 @@ -# Maintainer: Nicolas Pouillard <nicolas.pouillard@gmail.com> +Maintainer: +# Contributor: cqzw555 <cqzw555 at 163 dot com> +# Contributor: Luis Martinez <luis dot martinez at disroot dot org> +# Contributor: Nicolas Pouillard <nicolas.pouillard@gmail.com> # Contributor: Peter Simons <simons@cryp.to> pkgbase=pyutil -pkgname=('python2-pyutil' 'python-pyutil') -pkgver=3.3.0 +pkgname=python-pyutil +pkgver=3.3.6 pkgrel=1 -pkgdesc="general-purpose python library (used by tahoe-lafs)" +pkgdesc="General-purpose python library (used by tahoe-lafs)" arch=('any') -url='https://pypi.python.org/pypi/pyutil' +url='https://pypi.org/project/pyutil' license=('GPL2') -makedepends=('python2-setuptools' 'python-setuptools') -source=("https://files.pythonhosted.org/packages/source/p/pyutil/pyutil-${pkgver}.tar.gz") -sha256sums=('8c4d4bf668c559186389bb9bce99e4b1b871c09ba252a756ccaacd2b8f401848') +depends=('python') +optdepends=('python-simplejson: jsonutil support' + 'python-zbase32: randcookie support') +makedepends=('python-build' 'python-installer' 'python-setuptools' 'python-wheel' 'python-versioneer') +source=("$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/p/pyutil/pyutil-$pkgver.tar.gz" + 'setup.py.patch') +sha256sums=('5dc3d6bb9c5bababb5d0b773e094045d75712e8b34af2d29b0e28602668267c0' + 'c04d9474203ff677a0a23818d1d78eb7564f51f99dfac4ebf512170b5fdf7004') -package_python2-pyutil() { - depends=('python2-simplejson' 'python2-zbase32') - replaces=('pyutil') - cd "$srcdir/pyutil-$pkgver" - python2 setup.py install --root="$pkgdir" --prefix='/usr' --optimize=1 - rm -r "$pkgdir/usr/pyutil" +prepare() { + patch -p1 -d "pyutil-$pkgver" < setup.py.patch + rm -rf "$pkgbase-$pkgver/$pkgbase/test/" + find "$pkgbase-$pkgver" -name '*.pyc' -delete +} +build() { + cd "$pkgbase-$pkgver" + python -m build --wheel --no-isolation } package_python-pyutil() { - depends=('python-simplejson' 'python-zbase32') - cd "$srcdir/pyutil-$pkgver" - python setup.py install --root="$pkgdir" --prefix='/usr' --optimize=1 - rm -r "$pkgdir/usr/pyutil" + cd "$pkgbase-$pkgver" + PYTHONHASHSEED=0 python -m installer --destdir="$pkgdir" dist/*.whl } diff --git a/setup.py.patch b/setup.py.patch new file mode 100644 index 000000000000..a14adf52d5e8 --- /dev/null +++ b/setup.py.patch @@ -0,0 +1,42 @@ +diff --git a/setup.py b/setup.py +index 3941549..fbf66b9 100644 +--- a/setup.py ++++ b/setup.py +@@ -6,7 +6,7 @@ + # + # This file is part of pyutil; see README.rst for licensing terms. + +-import os, io, re, sys ++import os + + import versioneer + +@@ -35,18 +35,12 @@ trove_classifiers=[ + + PKG=u'pyutil' + +-doc_fnames=[ u'COPYING.SPL.txt', u'COPYING.GPL', u'COPYING.TGPPL.rst', u'README.rst', u'CREDITS' ] +- +-# In case we are building for a .deb with stdeb's sdist_dsc command, we put the +-# docs in "share/doc/python-$PKG". +-doc_loc = u"share/doc/" + PKG +- + data_files = [ +- (doc_loc, doc_fnames), +- (os.path.join(u'pyutil', u'data'), [os.path.join(u'pyutil', u'data', u'wordlist.txt')]) ++ (os.path.join(u'share', u'pyutil', u'data'), [os.path.join(u'pyutil', u'data', u'wordlist.txt')]) + ] + +-readmetext = io.open(u'README.rst', encoding='utf-8').read() ++with open('README.rst') as f: ++ readmetext = f.read() + + setup(name=PKG, + version=versioneer.get_version(), +@@ -81,6 +75,5 @@ setup(name=PKG, + u'try_decoding = pyutil.scripts.try_decoding:main', + u'passphrase = pyutil.scripts.passphrase:main', + ] }, +- test_suite=PKG+u".test", + zip_safe=False, # I prefer unzipped for easier access. + ) |