[arch-commits] Commit in (5 files)

Jonas Witschel diabonas at gemini.archlinux.org
Tue Mar 22 00:24:06 UTC 2022


    Date: Tuesday, March 22, 2022 @ 00:24:06
  Author: diabonas
Revision: 1169518

Switch build system to PEP 517 according to new Python package guidelines

Modified:
  libolm/trunk/PKGBUILD
  python-aiohttp-socks/trunk/PKGBUILD
  python-aiohttp/trunk/PKGBUILD
  python-python-pkcs11/trunk/PKGBUILD
  python-python-socks/trunk/PKGBUILD

-------------------------------------+
 libolm/trunk/PKGBUILD               |    7 ++++---
 python-aiohttp-socks/trunk/PKGBUILD |   15 +++++++--------
 python-aiohttp/trunk/PKGBUILD       |    6 +++---
 python-python-pkcs11/trunk/PKGBUILD |   12 +++++++-----
 python-python-socks/trunk/PKGBUILD  |    6 +++---
 5 files changed, 24 insertions(+), 22 deletions(-)

Modified: libolm/trunk/PKGBUILD
===================================================================
--- libolm/trunk/PKGBUILD	2022-03-22 00:20:33 UTC (rev 1169517)
+++ libolm/trunk/PKGBUILD	2022-03-22 00:24:06 UTC (rev 1169518)
@@ -7,7 +7,8 @@
 arch=('x86_64')
 url='https://gitlab.matrix.org/matrix-org/olm'
 license=('APACHE')
-makedepends=('git' 'cmake' 'python' 'python-cffi' 'python-future' 'python-setuptools')
+makedepends=('git' 'cmake' 'python' 'python-build' 'python-cffi' 'python-future'
+             'python-installer' 'python-setuptools' 'python-wheel')
 checkdepends=('python-aspectlib' 'python-pytest' 'python-pytest-benchmark')
 options=('debug')
 source=("git+$url.git?signed#tag=$_tag")
@@ -30,7 +31,7 @@
 	cmake --build build
 
 	cd python
-	python setup.py build
+	python -m build --wheel --no-isolation
 }
 
 check() {
@@ -54,5 +55,5 @@
 	depends=('libolm' 'python' 'python-cffi' 'python-future' 'libolm.so')
 
 	cd olm/python
-	python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+	python -m installer --destdir="$pkgdir" dist/*.whl
 }

Modified: python-aiohttp/trunk/PKGBUILD
===================================================================
--- python-aiohttp/trunk/PKGBUILD	2022-03-22 00:20:33 UTC (rev 1169517)
+++ python-aiohttp/trunk/PKGBUILD	2022-03-22 00:24:06 UTC (rev 1169518)
@@ -14,7 +14,7 @@
 depends=('python' 'python-chardet' 'python-multidict' 'python-async-timeout'
          'python-yarl' 'python-attrs' 'python-charset-normalizer'
          'python-aiosignal' 'python-frozenlist')
-makedepends=('cython' 'python-setuptools' 'git' 'npm')
+makedepends=('git' 'cython' 'npm' 'python-build' 'python-installer' 'python-wheel')
 checkdepends=('python-pytest' 'python-pytest-runner' 'python-pytest-mock'
               'python-pytest-timeout' 'python-async_generator' 'python-brotli'
               'python-pytest-xdist' 'python-pytest-forked' 'python-pytest-cov'
@@ -57,7 +57,7 @@
 build() {
   cd ${pkgname}
   make generate-llhttp cythonize
-  python setup.py build
+  python -m build --wheel --no-isolation
 }
 
 check() {
@@ -71,7 +71,7 @@
 
 package() {
   cd ${pkgname}
-  python setup.py install --root="${pkgdir}" -O1 --skip-build
+  python -m installer --destdir="$pkgdir" dist/*.whl
 }
 
 # vim: ts=2 sw=2 et:

Modified: python-aiohttp-socks/trunk/PKGBUILD
===================================================================
--- python-aiohttp-socks/trunk/PKGBUILD	2022-03-22 00:20:33 UTC (rev 1169517)
+++ python-aiohttp-socks/trunk/PKGBUILD	2022-03-22 00:24:06 UTC (rev 1169518)
@@ -8,25 +8,24 @@
 arch=('any')
 url="https://github.com/romis2012/aiohttp-socks/"
 license=('Apache')
-depends=('python-aiohttp' 'python-python-socks')
-makedepends=('git' 'python' 'python-setuptools')
+depends=('python' 'python-aiohttp' 'python-python-socks')
+makedepends=('git' 'python-build' 'python-installer' 'python-wheel')
 checkdepends=('python-flask' 'python-pytest' 'python-pytest-asyncio')
 source=("git+https://github.com/romis2012/aiohttp-socks?signed#tag=v${pkgver}")
 sha256sums=('SKIP')
 validpgpkeys=('706A8935FED55F3BFB7C188B5EEAD7400A5D80ED') # Roman Snegirev (maintainer)
 
-check() {
+build() {
     cd "${pkgname//python-}"
-    pytest
+    python -m build --wheel --no-isolation
 }
 
-build() {
+check() {
     cd "${pkgname//python-}"
-    python setup.py build
-
+    pytest
 }
 
 package() {
     cd "${pkgname//python-}"
-    python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1
+    python -m installer --destdir="$pkgdir" dist/*.whl
 }

Modified: python-python-pkcs11/trunk/PKGBUILD
===================================================================
--- python-python-pkcs11/trunk/PKGBUILD	2022-03-22 00:20:33 UTC (rev 1169517)
+++ python-python-pkcs11/trunk/PKGBUILD	2022-03-22 00:24:06 UTC (rev 1169518)
@@ -8,8 +8,9 @@
 url='https://github.com/danni/python-pkcs11'
 license=('MIT')
 depends=('python' 'python-asn1crypto' 'python-cached-property')
-makedepends=('cython' 'python-setuptools' 'python-setuptools-scm')
-checkdepends=('python-cryptography' 'python-oscrypto' 'softhsm')
+makedepends=('cython' 'python-build' 'python-installer' 'python-setuptools'
+             'python-setuptools-scm' 'python-wheel')
+checkdepends=('python-cryptography' 'python-oscrypto' 'python-pytest' 'softhsm')
 source=("https://files.pythonhosted.org/packages/source/${_name::1}/$_name/$_name-$pkgver.tar.gz"
         'python-pkcs11_mark-tests-as-xfail.patch')
 sha256sums=('9737e0c24cabb8bc9d48bf8c57c3df2a70f8cdd96b70c50290803286f9e46bf7'
@@ -27,7 +28,7 @@
 
 build() {
 	cd "$_name-$pkgver"
-	python setup.py build
+	python -m build --wheel --no-isolation
 }
 
 check() {
@@ -37,11 +38,12 @@
 	export PKCS11_TOKEN_LABEL=TEST
 	export PKCS11_TOKEN_PIN=1234
 	export PKCS11_TOKEN_SO_PIN=5678
-	python setup.py test
+	cp build/lib.*/pkcs11/*.so pkcs11
+	pytest
 }
 
 package() {
 	cd "$_name-$pkgver"
-	python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+	python -m installer --destdir="$pkgdir" dist/*.whl
 	install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname"
 }

Modified: python-python-socks/trunk/PKGBUILD
===================================================================
--- python-python-socks/trunk/PKGBUILD	2022-03-22 00:20:33 UTC (rev 1169517)
+++ python-python-socks/trunk/PKGBUILD	2022-03-22 00:24:06 UTC (rev 1169518)
@@ -8,7 +8,7 @@
 url='https://github.com/romis2012/python-socks'
 license=('APACHE')
 depends=('python') 
-makedepends=('git' 'python-setuptools')
+makedepends=('git' 'python-build' 'python-installer' 'python-wheel')
 checkdepends=('python-async-timeout' 'python-curio' 'python-flask' 'python-pytest'
               'python-pytest-asyncio' 'python-pytest-trio' 'python-trio' 'python-yarl')
 optdepends=('python-async-timeout: asyncio support'
@@ -27,7 +27,7 @@
 
 build() {
 	cd "${pkgname#python-}"
-	python setup.py build
+	python -m build --wheel --no-isolation
 }
 
 check() {
@@ -37,5 +37,5 @@
 
 package() {
 	cd "${pkgname#python-}"
-	python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+	python -m installer --destdir="$pkgdir" dist/*.whl
 }



More information about the arch-commits mailing list