summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO15
-rw-r--r--.gitignore4
-rw-r--r--PKGBUILD28
-rw-r--r--fix_warnings.patch22
4 files changed, 51 insertions, 18 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 97f56c604bba..d7adab0dad5a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,18 @@
pkgbase = python-concurrencytest
pkgdesc = Python testtools extension for running unittest suites concurrently.
- pkgver = 0.1.2
- pkgrel = 4
+ pkgver = 0.1.2.4
+ pkgrel = 1
url = https://github.com/cgoldberg/concurrencytest
arch = any
license = GPL3
- makedepends = python-setuptools
+ makedepends = python-build
+ makedepends = python-installer
+ makedepends = python-wheel
depends = python-testtools
depends = python-subunit
- source = https://pypi.python.org/packages/ba/8a/8286de6d3aa9a3c4765cb3dd73515d91129f012a61e0ec8578c733ea2d27/concurrencytest-0.1.2.tar.gz
- md5sums = 773d9a8be83fc043a32a25b6665bf59b
+ source = https://github.com/cgoldberg/concurrencytest/archive/c807f3e1428ff91ad93f270306966bc6597f3adf.zip
+ source = fix_warnings.patch
+ md5sums = 223e5dd7a97d95a464de3a06c4734aba
+ md5sums = 26a55216936cd4c7970d0ced04bc9c47
pkgname = python-concurrencytest
-
diff --git a/.gitignore b/.gitignore
index 8732fbec1d79..d588d4ea5e89 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
/pkg
/src
-/*.tar.gz
-/*.pkg.tar.xz
+/*.tar.zst
+/*.zip
diff --git a/PKGBUILD b/PKGBUILD
index c6abe7d1cecb..c4e3adbd3ce6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,36 @@
# Maintainer: Maximilian Stahlberg <maximilian.stahlberg tu-berlin de>
pkgname=python-concurrencytest
-pkgver=0.1.2
-pkgrel=4
+pkgver=0.1.2.4
+_commit=c807f3e1428ff91ad93f270306966bc6597f3adf
+pkgrel=1
pkgdesc='Python testtools extension for running unittest suites concurrently.'
arch=('any')
url='https://github.com/cgoldberg/concurrencytest'
license=('GPL3')
depends=('python-testtools' 'python-subunit')
-makedepends=('python-setuptools')
-source=("https://pypi.python.org/packages/ba/8a/8286de6d3aa9a3c4765cb3dd73515d91129f012a61e0ec8578c733ea2d27/concurrencytest-${pkgver}.tar.gz")
-md5sums=('773d9a8be83fc043a32a25b6665bf59b')
+makedepends=('python-build' 'python-installer' 'python-wheel')
+source=("https://github.com/cgoldberg/concurrencytest/archive/${_commit}.zip"
+ "fix_warnings.patch")
+md5sums=('223e5dd7a97d95a464de3a06c4734aba'
+ '26a55216936cd4c7970d0ced04bc9c47')
+
+prepare() {
+ cd "${srcdir}/concurrencytest-${_commit}"
+ patch --forward --strip=1 --input="${srcdir}/fix_warnings.patch"
+}
build() {
- cd "${srcdir}/concurrencytest-${pkgver}"
- python setup.py build
+ cd "${srcdir}/concurrencytest-${_commit}"
+ python -m build --wheel --no-isolation
}
check() {
- cd "${srcdir}/concurrencytest-${pkgver}/build/lib"
+ cd "${srcdir}/concurrencytest-${_commit}/build/lib"
python -Bc "import concurrencytest"
}
package() {
- cd "${srcdir}/concurrencytest-${pkgver}"
- python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
+ cd "${srcdir}/concurrencytest-${_commit}"
+ python -m installer --destdir="${pkgdir}" dist/*.whl
}
diff --git a/fix_warnings.patch b/fix_warnings.patch
new file mode 100644
index 000000000000..53b22078c402
--- /dev/null
+++ b/fix_warnings.patch
@@ -0,0 +1,22 @@
+diff --git a/concurrencytest.py b/concurrencytest.py
+index 058c054..758a148 100644
+--- a/concurrencytest.py
++++ b/concurrencytest.py
+@@ -69,7 +69,7 @@ def do_fork(suite):
+ pid = os.fork()
+ if pid == 0:
+ try:
+- stream = os.fdopen(c2pwrite, 'wb', 1)
++ stream = os.fdopen(c2pwrite, 'wb')
+ os.close(c2pread)
+ # Leave stderr and stdout open so we can see test noise
+ # Close stdin so that the child goes away if it decides to
+@@ -93,7 +93,7 @@ def do_fork(suite):
+ os._exit(0)
+ else:
+ os.close(c2pwrite)
+- stream = os.fdopen(c2pread, 'rb', 1)
++ stream = os.fdopen(c2pread, 'rb')
+ test = ProtocolTestCase(stream)
+ result.append(test)
+ return result