update to 1.0.1

3 files changed, 73 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c9b8bb6fdc00..b5788649c118 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,20 @@
 pkgbase = python-txzmq
 	pkgdesc = Twisted bindings for ZeroMQ
-	pkgver = 1.0.0
-	pkgrel = 2
-	url = https://pypi.org/project/txZMQ
+	pkgver = 1.0.1
+	pkgrel = 1
+	url = https://github.com/smira/txzmq
 	arch = any
 	license = MPL2
+	makedepends = python-build
+	makedepends = python-installer
 	makedepends = python-setuptools
+	makedepends = python-sphinx
+	makedepends = python-wheel
 	depends = python-twisted
 	depends = python-pyzmq
-	source = https://pypi.io/packages/source/t/txZMQ/txZMQ-1.0.0.tar.gz
-	sha256sums = 8d607d0bf09ca94600b8e42f0721dbe43ee53a0470182344ac7ace7e58dc6177
+	source = python-txzmq-1.0.1.tar.gz::https://github.com/smira/txzmq/archive/1.0.1.tar.gz
+	source = setup.py.patch
+	sha256sums = b904411b4894ab4e1d2af65f632ceb3103e86cf38e490cd552ac7a12f78b5c38
+	sha256sums = 70b696fca4b06c0d90f78410e2f63796fd2c6a6d763c1d53f133a21a5cad30a5
 
 pkgname = python-txzmq
diff --git a/PKGBUILD b/PKGBUILD
index aec2926a0194..e54afdd92c50 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,44 @@
 # Maintainer: Michal Wojdyla <micwoj9292 at gmail dot com>
 
 pkgname=python-txzmq
-pkgver=1.0.0
-pkgrel=2
-arch=('any')
-url="https://pypi.org/project/txZMQ"
-license=("MPL2")
+_pkg=txZMQ
+pkgver=1.0.1
+pkgrel=1
 pkgdesc="Twisted bindings for ZeroMQ"
+arch=('any')
+url='https://github.com/smira/txzmq'
+license=('MPL2')
 depends=('python-twisted' 'python-pyzmq')
-makedepends=('python-setuptools')
-source=("https://pypi.io/packages/source/t/txZMQ/txZMQ-${pkgver}.tar.gz")
-sha256sums=('8d607d0bf09ca94600b8e42f0721dbe43ee53a0470182344ac7ace7e58dc6177')
+makedepends=(
+	'python-build'
+	'python-installer'
+	'python-setuptools'
+	'python-sphinx'
+	'python-wheel')
+source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz"
+        'setup.py.patch')
+sha256sums=('b904411b4894ab4e1d2af65f632ceb3103e86cf38e490cd552ac7a12f78b5c38'
+            '70b696fca4b06c0d90f78410e2f63796fd2c6a6d763c1d53f133a21a5cad30a5')
+
+prepare() {
+	cd "$_pkg-$pkgver"
+	patch -p1 < "$srcdir/setup.py.patch"
+	sed -i "s/'\$\$PKGVER\$\$'/'$pkgver'/" setup.py
+}
 
 build() {
-    cd txZMQ-$pkgver
-    python setup.py build
+	cd "$_pkg-$pkgver"
+	python -m build --wheel --no-isolation
+	make -C docs man
+}
+
+check() {
+	cd "$_pkg-$pkgver"
+	python -m unittest discover
 }
 
 package() {
-    cd txZMQ-$pkgver
-    python setup.py install --root="$pkgdir" --optimize=1
+	cd "$_pkg-$pkgver"
+	PYTHONHASHSEED=0 python -m installer --destdir="$pkgdir" dist/*.whl
+	install -Dm644 docs/_build/man/txzmq.1 -t "$pkgdir/usr/share/man/man1/"
 }
diff --git a/setup.py.patch b/setup.py.patch
new file mode 100644
index 000000000000..45e51dedf500
--- /dev/null
+++ b/setup.py.patch
@@ -0,0 +1,29 @@
+diff --git a/setup.py b/setup.py
+index c0fd889..02f2f45 100644
+--- a/setup.py
++++ b/setup.py
+@@ -1,11 +1,12 @@
+-import io
+-
+ from setuptools import setup
+ 
++with open('README.rst', encoding='utf-8') as f:
++    desc=f.read()
++
+ setup(
+     name='txZMQ',
+-    version=io.open('VERSION', encoding='utf-8').read().strip(),
+-    packages=['txzmq', 'txzmq.test'],
++    version='$$PKGVER$$',
++    packages=['txzmq'],
+     license='MPLv2',
+     author='Andrey Smirnov',
+     author_email='me@smira.ru',
+@@ -20,6 +21,6 @@ setup(
+         "Programming Language :: Python :: 3",
+         "Topic :: Software Development :: Libraries",
+     ],
+-    long_description=io.open('README.rst', encoding='utf-8').read(),
++    long_description=desc,
+     install_requires=["Twisted>=10.0", "pyzmq>=13"],
+ )