diff --git a/packages/python-msoffcrypto-tool/PKGBUILD b/packages/python-msoffcrypto-tool/PKGBUILD index 248f9fd44aa..b1aca4ed0b8 100644 --- a/packages/python-msoffcrypto-tool/PKGBUILD +++ b/packages/python-msoffcrypto-tool/PKGBUILD @@ -1,48 +1,39 @@ # This file is part of BlackArch Linux ( https://www.blackarch.org/ ). # See COPYING for license details. -pkgbase=python-msoffcrypto-tool -pkgname=('python2-msoffcrypto-tool' 'python-msoffcrypto-tool') -_pkgname=msoffcrypto-tool +pkgname=python-msoffcrypto-tool +_pkgname=msoffcrypto_tool pkgver=5.1.1 -pkgrel=2 +pkgrel=1 pkgdesc='A Python tool and library for decrypting MS Office files with passwords or other keys.' arch=('any') url='https://pypi.org/project/msoffcrypto-tool/#files' license=('MIT') -makedepends=('python2-setuptools' 'python-setuptools') +depends=('python' 'python-cryptography' 'python-olefile') +makedepends=('python-pip' 'python-build' 'python-wheel') source=("https://files.pythonhosted.org/packages/source/${_pkgname::1}/$_pkgname/$_pkgname-$pkgver.tar.gz") sha512sums=('840b916cae8ddcf264070b952450ccf1948e84418bf674d527a29273a5b25a556db97d69a86bbaf10f685669fba388b933870bd972cb6c1b2e7b101fc53e2e20') -prepare() { - cp -a "$_pkgname-$pkgver"{,-2} -} - build() { - cd "$_pkgname-$pkgver-2" - - python2 setup.py build - - cd "$srcdir/$_pkgname-$pkgver" - - python setup.py build -} - -package_python2-msoffcrypto-tool() { - depends=('python2' 'python2-olefile' 'python2-cryptography') - - cd "$_pkgname-$pkgver-2" - - python2 setup.py install --prefix=/usr --root="$pkgdir" -O1 --skip-build + cd "$_pkgname-$pkgver" - mv "$pkgdir/usr/bin/$_pkgname" "$pkgdir/usr/bin/${_pkgname}-2" + python -m build --wheel --outdir="$startdir/dist" } -package_python-msoffcrypto-tool() { - depends=('python' 'python-olefile' 'python-cryptography') - +package() { cd "$_pkgname-$pkgver" - python setup.py install --prefix=/usr --root="$pkgdir" -O1 --skip-build + pip install \ + --verbose \ + --disable-pip-version-check \ + --no-warn-script-location \ + --ignore-installed \ + --no-compile \ + --no-deps \ + --root="$pkgdir" \ + --prefix=/usr \ + --no-index \ + --find-links="file://$startdir/dist" \ + $_pkgname } diff --git a/packages/python-names/PKGBUILD b/packages/python-names/PKGBUILD index 53827c6b70b..5a669bf39db 100644 --- a/packages/python-names/PKGBUILD +++ b/packages/python-names/PKGBUILD @@ -2,28 +2,39 @@ # See COPYING for license details. pkgname=python-names +_pkgname=names pkgver=0.3.0 -pkgrel=7 +pkgrel=6 epoch=1 pkgdesc='Random name generator.' arch=('any') url='https://pypi.org/project/names/#files' license=('MIT') depends=('python') -makedepends=('python' 'python-setuptools') +makedepends=('python-pip' 'python-build' 'python-wheel') source=("https://files.pythonhosted.org/packages/source/${_pkgname::1}/$_pkgname/names-$pkgver.tar.gz") sha512sums=('cdc65b688b82be00f2b40fc4276bed6980d8cf2868976ef604c9776de7dc541f715dfd4c8905a031611515e504b6d13fd0a6c95c5c1f69ab16ed3bf26a360d83') build() { - cd "names-$pkgver" + cd "$_pkgname-$pkgver" - python setup.py build + python -m build --wheel --outdir="$startdir/dist" } package() { - cd "names-$pkgver" + cd "$_pkgname-$pkgver" - python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 \ - --skip-build + pip install \ + --verbose \ + --disable-pip-version-check \ + --no-warn-script-location \ + --ignore-installed \ + --no-compile \ + --no-deps \ + --root="$pkgdir" \ + --prefix=/usr \ + --no-index \ + --find-links="file://$startdir/dist" \ + $_pkgname } diff --git a/packages/python-normality/PKGBUILD b/packages/python-normality/PKGBUILD index 33be592b672..b47cec29b18 100644 --- a/packages/python-normality/PKGBUILD +++ b/packages/python-normality/PKGBUILD @@ -5,26 +5,37 @@ pkgname=python-normality _pkgname=normality _pyver=3.11 pkgver=2.4.0 -pkgrel=4 +pkgrel=1 pkgdesc='Micro-library to normalize text strings.' arch=('any') url='https://pypi.org/project/normality/#files' license=('MIT') depends=('python' 'python-six' 'python-chardet' 'python-pyicu' 'python-banal') -makedepends=('python-setuptools') +makedepends=('python-pip' 'python-build' 'python-wheel') source=("https://files.pythonhosted.org/packages/source/${_pkgname::1}/$_pkgname/$_pkgname-$pkgver.tar.gz") sha512sums=('025dc03fac23549cbb4287833d6ce13bf3a7a3d6d4a3407315c67c440e91e00f19390588fb85953e099efc3c8fc1039140680388e38edfd7a52cdd3644c8c689') build() { cd "$_pkgname-$pkgver" - python setup.py build + python -m build --wheel --outdir="$startdir/dist" } package() { cd "$_pkgname-$pkgver" - python setup.py install --root="$pkgdir" --prefix=/usr -O1 --skip-build + pip install \ + --verbose \ + --disable-pip-version-check \ + --no-warn-script-location \ + --ignore-installed \ + --no-compile \ + --no-deps \ + --root="$pkgdir" \ + --prefix=/usr \ + --no-index \ + --find-links="file://$startdir/dist" \ + $_pkgname rm -rf "$pkgdir/usr/lib/python$_pyver/site-packages/tests" } diff --git a/packages/python-optparse-pretty/PKGBUILD b/packages/python-optparse-pretty/PKGBUILD index c8958678b80..be26f576692 100644 --- a/packages/python-optparse-pretty/PKGBUILD +++ b/packages/python-optparse-pretty/PKGBUILD @@ -1,43 +1,39 @@ # This file is part of BlackArch Linux ( https://www.blackarch.org/ ). # See COPYING for license details. -pkgbase=python-optparse-pretty -pkgname=('python2-optparse-pretty' 'python-optparse-pretty') +pkgname=python-optparse-pretty +_pkgname=optparse-pretty pkgver=0.1.1 pkgrel=6 pkgdesc='A more compact help formatter for optparse.' arch=('any') url='https://pypi.org/project/optparse-pretty/#files' license=('BSD') -makedepends=('python2-setuptools' 'python-setuptools') +depends=('python') +makedepends=('python-pip' 'python-build' 'python-wheel') source=("https://files.pythonhosted.org/packages/source/${_pkgname::1}/$_pkgname/optparse-pretty-$pkgver.tar.gz") sha512sums=('2342109e9e258842803d2e6d3e8ad0a4082bd9bec9260ce4049328c0f0326cd79dc256e19765a91bf6d62cefcb3891b43682ef7fcbe928b4457bb6d7f5436cbe') -prepare() { - cp -a "optparse-pretty-$pkgver" "optparse-pretty2-$pkgver" -} - build() { - cd "optparse-pretty2-$pkgver" - - python2 setup.py build - - cd "$srcdir/optparse-pretty-$pkgver" + cd "$_pkgname-$pkgver" - python setup.py build + python -m build --wheel --outdir="$startdir/dist" } -package_python2-optparse-pretty() { - cd "optparse-pretty2-$pkgver" - - python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 \ - --skip-build -} - -package_python-optparse-pretty() { - cd "optparse-pretty-$pkgver" - - python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 \ - --skip-build +package() { + cd "$_pkgname-$pkgver" + + pip install \ + --verbose \ + --disable-pip-version-check \ + --no-warn-script-location \ + --ignore-installed \ + --no-compile \ + --no-deps \ + --root="$pkgdir" \ + --prefix=/usr \ + --no-index \ + --find-links="file://$startdir/dist" \ + $_pkgname } diff --git a/packages/python-pathlib/PKGBUILD b/packages/python-pathlib/PKGBUILD index ae03c239d26..593725c24c7 100644 --- a/packages/python-pathlib/PKGBUILD +++ b/packages/python-pathlib/PKGBUILD @@ -4,28 +4,39 @@ pkgname=python-pathlib _pkgname=pathlib pkgver=1.0.1 -pkgrel=4 +_pyver=3.11 +pkgrel=3 pkgdesc='Python library that offers a set of classes to handle filesystem paths.' arch=('any') url='https://pypi.org/project/pathlib/' license=('MIT') depends=('python') -makedepends=('python-setuptools') +makedepends=('python-pip' 'python-build' 'python-wheel') source=("https://files.pythonhosted.org/packages/source/${_pkgname::1}/$_pkgname/$_pkgname-$pkgver.tar.gz") sha512sums=('d85e45dfcc85ce75a7e7b609163dc8c75c688f279c1833510185f280af5501e473376dc09bddc6a804d1fcc3177a939db85af37b7b8d5b183b9bc2b85b3b0f8b') -_pyver='3.9' build() { cd "$_pkgname-$pkgver" - python setup.py build + python -m build --wheel --outdir="$startdir/dist" } package() { cd "$_pkgname-$pkgver" - python setup.py install --root="$pkgdir" --prefix=/usr -O1 --skip-build + pip install \ + --verbose \ + --disable-pip-version-check \ + --no-warn-script-location \ + --ignore-installed \ + --no-compile \ + --no-deps \ + --root="$pkgdir" \ + --prefix=/usr \ + --no-index \ + --find-links="file://$startdir/dist" \ + $_pkgname - rm -rf "$pkgdir/usr/lib/python${_pyver}/site-packages/__pycache__" + rm -rf "$pkgdir/usr/lib/python$_pyver/site-packages/__pycache__" } diff --git a/packages/python-pika/PKGBUILD b/packages/python-pika/PKGBUILD index 4aeeccc442c..440bc3acf4f 100644 --- a/packages/python-pika/PKGBUILD +++ b/packages/python-pika/PKGBUILD @@ -4,25 +4,36 @@ pkgname=python-pika _pkgname=pika pkgver=1.3.2 -pkgrel=2 +pkgrel=1 pkgdesc='Pika Python AMQP Client Library.' arch=('any') url='https://pypi.org/project/pika/#files' license=('BSD') depends=('python') -makedepends=('python-setuptools' 'python-pip' 'python-wheel') +makedepends=('python-pip' 'python-build' 'python-wheel') source=("https://files.pythonhosted.org/packages/source/${_pkgname::1}/$_pkgname/$_pkgname-$pkgver.tar.gz") sha512sums=('802eae5a3c11d2b5ec6f921809c2c68d7438a0b3ceda2619ea9f328737564aa017bc57f4304415d7f0febd4a3bfb64dde723871462a33c713e91b60476165f85') build() { cd "$_pkgname-$pkgver" - python setup.py build + python -m build --wheel --outdir="$startdir/dist" } package() { cd "$_pkgname-$pkgver" - python setup.py install --root="$pkgdir" --prefix=/usr -O1 --skip-build + pip install \ + --verbose \ + --disable-pip-version-check \ + --no-warn-script-location \ + --ignore-installed \ + --no-compile \ + --no-deps \ + --root="$pkgdir" \ + --prefix=/usr \ + --no-index \ + --find-links="file://$startdir/dist" \ + $_pkgname } diff --git a/packages/python-property/PKGBUILD b/packages/python-property/PKGBUILD index 0d397c0d1a3..4437f273cd2 100644 --- a/packages/python-property/PKGBUILD +++ b/packages/python-property/PKGBUILD @@ -1,47 +1,38 @@ # This file is part of BlackArch Linux ( https://www.blackarch.org/ ). # See COPYING for license details. -pkgbase=python-property -pkgname=('python2-property' 'python-property') +pkgname=python-property _pkgname=property pkgver=2.6.2 -pkgrel=3 +pkgrel=1 pkgdesc='A python module to read a property file.' arch=('any') url='https://pypi.org/project/property/#files' license=('custom:unknown') -makedepends=('python2-setuptools' 'python-setuptools' 'python2-pip' 'python-pip' - 'python2-wheel' 'python-wheel') +makedepends=('python-pip' 'python-build' 'python-wheel') source=("https://files.pythonhosted.org/packages/source/${_pkgname::1}/$_pkgname/$_pkgname-$pkgver.tar.gz") sha512sums=('0eed7208a60f7c76ca412e7582584f99566b597e9dfe2ef1245a30e3f7f401c7fc42ecd8b0d85e2033c0b4172de30a20b9f03e37aa7e87d32ee95951489cc82a') -prepare() { - cp -a "$_pkgname-$pkgver"{,-2} -} - build() { - cd "$_pkgname-$pkgver-2" - - python2 setup.py build - - cd "$srcdir/$_pkgname-$pkgver" - - python setup.py build -} - -package_python2-property() { - depends=('python2') - - cd "$_pkgname-$pkgver-2" + cd "$_pkgname-$pkgver" - python2 setup.py install --prefix=/usr --root="$pkgdir" -O1 --skip-build + python -m build --wheel --outdir="$startdir/dist" } -package_python-property() { - depends=('python') - +package() { cd "$_pkgname-$pkgver" - python setup.py install --prefix=/usr --root="$pkgdir" -O1 --skip-build + pip install \ + --verbose \ + --disable-pip-version-check \ + --no-warn-script-location \ + --ignore-installed \ + --no-compile \ + --no-deps \ + --root="$pkgdir" \ + --prefix=/usr \ + --no-index \ + --find-links="file://$startdir/dist" \ + $_pkgname } diff --git a/packages/python-proxylist/PKGBUILD b/packages/python-proxylist/PKGBUILD index 4d37e7fde76..aa39fa2a36a 100644 --- a/packages/python-proxylist/PKGBUILD +++ b/packages/python-proxylist/PKGBUILD @@ -1,48 +1,39 @@ # This file is part of BlackArch Linux ( https://www.blackarch.org/ ). # See COPYING for license details. -pkgbase=python-proxylist -pkgname=('python2-proxylist' 'python-proxylist') +pkgname=python-proxylist _pkgname=proxylist pkgver=0.2.1 -pkgrel=3 +pkgrel=1 pkgdesc='Managing list of proxies.' arch=('any') url='https://pypi.org/project/proxylist/#files' license=('MIT') -makedepends=('python2-setuptools' 'python-setuptools') +depends=('python' 'python-six') +makedepends=('python-pip' 'python-build' 'python-wheel') source=("https://files.pythonhosted.org/packages/source/${_pkgname::1}/$_pkgname/$_pkgname-$pkgver.tar.gz") sha512sums=('9c935e2dcc606f6f1c96a2a52befb1997409442841414950742646274c145fdad065978bcd674c0909e969298f1119aaf1248b77f6ec4a50558d656a65ee863d') -prepare() { - cp -a "$_pkgname-$pkgver"{,-2} -} - build() { - cd "$_pkgname-$pkgver-2" - - python2 setup.py build - - cd "$srcdir/$_pkgname-$pkgver" - - python setup.py build -} - -package_python2-proxylist() { - depends=('python2' 'python2-six') - - cd "$_pkgname-$pkgver-2" + cd "$_pkgname-$pkgver" - python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 \ - --skip-build + python -m build --wheel --outdir="$startdir/dist" } -package_python-proxylist() { - depends=('python' 'python-six') - +package() { cd "$_pkgname-$pkgver" - python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 \ - --skip-build + pip install \ + --verbose \ + --disable-pip-version-check \ + --no-warn-script-location \ + --ignore-installed \ + --no-compile \ + --no-deps \ + --root="$pkgdir" \ + --prefix=/usr \ + --no-index \ + --find-links="file://$startdir/dist" \ + $_pkgname } diff --git a/packages/python-pygraphviz/PKGBUILD b/packages/python-pygraphviz/PKGBUILD index eeb4491346f..b12e2b4c485 100644 --- a/packages/python-pygraphviz/PKGBUILD +++ b/packages/python-pygraphviz/PKGBUILD @@ -4,9 +4,9 @@ pkgbase=python-pygraphviz pkgname=('python2-pygraphviz' 'python-pygraphviz') _pkgname=pygraphviz -pkgver=1.11 +pkgver=1.5 +pkgrel=9 epoch=1 -pkgrel=2 pkgdesc='Python interface to the Graphviz graph layout and visualization package.' arch=('x86_64' 'aarch64') url='https://pypi.org/project/pygraphviz/#files' @@ -14,7 +14,7 @@ license=('LGPL') makedepends=('python2-setuptools' 'python-setuptools' 'python2-pip' 'python-pip' 'python2-wheel' 'python-wheel' 'graphviz') source=("https://files.pythonhosted.org/packages/source/${_pkgname::1}/$_pkgname/$_pkgname-$pkgver.zip") -sha512sums=('3914d29fb214e1f7d59c7849e1e63e783902acd262912eccffbf6a67f8cbf6f540b9f2e84c9e7b4f0d90fae27f451a701a3b75a4dcb15b8a81bed463b34e2ef2') +sha512sums=('6d3df6642a7e23ecb6b687761480b80a3ee5886508ef50b81697041425be7d09d623bf46990c5cea3ef36817a28d9e5c2905eb32267296f55524fdedb2199ea2') prepare() { cp -a "$_pkgname-$pkgver"{,-2} diff --git a/packages/python-pyminifier/PKGBUILD b/packages/python-pyminifier/PKGBUILD index a588c9e0038..2dbcbe66bdc 100644 --- a/packages/python-pyminifier/PKGBUILD +++ b/packages/python-pyminifier/PKGBUILD @@ -4,25 +4,44 @@ pkgname=python-pyminifier _pkgname=pyminifier pkgver=2.1 -pkgrel=8 +pkgrel=7 pkgdesc='Python code minifier, obfuscator, and compressor.' arch=('any') url='https://pypi.org/project/pyminifier/#files' license=('GPL3') depends=('python') -makedepends=('python-setuptools') -source=("https://files.pythonhosted.org/packages/source/${_pkgname::1}/$_pkgname/$_pkgname-$pkgver.tar.gz") -sha512sums=('d9335b27acb11bf5c9fbd3bac173ee5cf6e66be9f2c879b1f0c059a84dfb845765e69775f2efe7fd0453d6d1916a0dcd1fcab3f4850076bbcf558561853f771c') +makedepends=('python-pip' 'python-build' 'python-wheel') +source=("https://files.pythonhosted.org/packages/source/${_pkgname::1}/$_pkgname/$_pkgname-$pkgver.tar.gz" + 'setup.py.patch') +sha512sums=('d9335b27acb11bf5c9fbd3bac173ee5cf6e66be9f2c879b1f0c059a84dfb845765e69775f2efe7fd0453d6d1916a0dcd1fcab3f4850076bbcf558561853f771c' + '20642fe330eb69d993b0a5ff12920c8556cf3ef2a3eaff125605cf1d0c5f2b5dc3882959fceb00fe511eb4a468d1496188255f3cbc2d3520ba24b40cd580acd2') + +prepare() { + cd "$_pkgname-$pkgver" + + patch -p0 < ../setup.py.patch +} build() { cd "$_pkgname-$pkgver" - python setup.py build + python -m build --wheel --outdir="$startdir/dist" } package() { cd "$_pkgname-$pkgver" - python setup.py install --root="$pkgdir" --prefix=/usr -O1 --skip-build + pip install \ + --verbose \ + --disable-pip-version-check \ + --no-warn-script-location \ + --ignore-installed \ + --no-compile \ + --no-deps \ + --root="$pkgdir" \ + --prefix=/usr \ + --no-index \ + --find-links="file://$startdir/dist" \ + $_pkgname } diff --git a/packages/python-pyminifier/setup.py.patch b/packages/python-pyminifier/setup.py.patch new file mode 100644 index 00000000000..ed31c018e90 --- /dev/null +++ b/packages/python-pyminifier/setup.py.patch @@ -0,0 +1,30 @@ +--- src/pyminifier-2.1/setup.py 2014-05-24 21:11:30.000000000 +0200 ++++ setup.py 2023-09-01 09:30:48.423331863 +0200 +@@ -2,26 +2,13 @@ + import pyminifier + from setuptools import setup + from distutils.command.install import INSTALL_SCHEMES ++from distutils.command.build_py import build_py + + for scheme in INSTALL_SCHEMES.values(): + scheme['data'] = scheme['purelib'] + + extra = {} + +-if sys.version_info.major == 2: +- from distutils.command.build_py import build_py +-elif sys.version_info.major == 3: +- extra['use_2to3'] = True # Automatically convert to Python 3; love it! +- try: +- from distutils.command.build_py import build_py_2to3 as build_py +- except ImportError: +- print("Python 3.X support requires the 2to3 tool.") +- print( +- "It normally comes with Python 3.X but (apparenty) not on your " +- "distribution.\nPlease find out what package you need to get 2to3" +- "and install it.") +- sys.exit(1) +- + cmdclass = {'build_py': build_py} + + setup( diff --git a/packages/python-pymisp/PKGBUILD b/packages/python-pymisp/PKGBUILD index 4cf10e542a7..f124c98a607 100644 --- a/packages/python-pymisp/PKGBUILD +++ b/packages/python-pymisp/PKGBUILD @@ -1,33 +1,41 @@ # This file is part of BlackArch Linux ( https://www.blackarch.org/ ). # See COPYING for license details. -pkgbase=python-pymisp -pkgname=('python-pymisp') +pkgname=python-pymisp _pkgname=pymisp pkgver=2.4.175 -pkgrel=2 +pkgrel=1 pkgdesc='Python API for MISP.' arch=('any') url='https://pypi.org/project/pymisp/#files' license=('BSD') -makedepends=('python-setuptools') +depends=('python' 'python-six' 'python-dateutil' 'python-jsonschema' + 'python-requests' 'python-deprecated') +makedepends=('python-pip' 'python-build' 'python-wheel') +optdepends=('python-virustotal-api: VirusTotal support') source=("https://files.pythonhosted.org/packages/source/${_pkgname::1}/$_pkgname/$_pkgname-$pkgver.tar.gz") sha512sums=('7439ce4a5b5ecb4186c733dacc428a6521a790803eed2e3329d9ca6695e6f5105a55eb19141f6f5af5a191fe30e765d78d43a867fedd64bb1eefc69db9731ab5') build() { - cd "$srcdir/$_pkgname-$pkgver" + cd "$_pkgname-$pkgver" - python setup.py build + python -m build --wheel --outdir="$startdir/dist" } -package_python-pymisp() { - depends=('python' 'python-six' 'python-dateutil' 'python-jsonschema' - 'python-requests' 'python-deprecated') - optdepends=('python-virustotal-api: VirusTotal support') - +package() { cd "$_pkgname-$pkgver" - python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 \ - --skip-build + pip install \ + --verbose \ + --disable-pip-version-check \ + --no-warn-script-location \ + --ignore-installed \ + --no-compile \ + --no-deps \ + --root="$pkgdir" \ + --prefix=/usr \ + --no-index \ + --find-links="file://$startdir/dist" \ + $_pkgname } diff --git a/packages/python-pymssql/PKGBUILD b/packages/python-pymssql/PKGBUILD index 408b736ff8a..ce0eeb71cc9 100644 --- a/packages/python-pymssql/PKGBUILD +++ b/packages/python-pymssql/PKGBUILD @@ -4,25 +4,36 @@ pkgname=python-pymssql _pkgname=pymssql pkgver=2.2.8 -pkgrel=2 +pkgrel=1 pkgdesc='DB-API interface to Microsoft SQL Server for Python. (new Cython-based version).' arch=('x86_64' 'aarch64') url='https://pypi.org/project/pymssql/#files' license=('LGPL') depends=('python' 'freetds') -makedepends=('python-setuptools-scm' 'cython') +makedepends=('python-pip' 'python-build' 'python-wheel' 'cython') source=("https://files.pythonhosted.org/packages/source/${_pkgname::1}/$_pkgname/$_pkgname-$pkgver.tar.gz") sha512sums=('2b1ad380085d8978e7c6b4d6c0f6a1c61c8d7f97b0f8626586e916f8f1644284fcd04b8110a0ce4d8efc8f406cdb1ffa08f630ea2d1767d90887bf75eabaa22a') build() { cd "$_pkgname-$pkgver" - python setup.py build + python -m build --wheel --outdir="$startdir/dist" } package() { cd "$_pkgname-$pkgver" - python setup.py install --root="$pkgdir" --prefix=/usr -O1 --skip-build + pip install \ + --verbose \ + --disable-pip-version-check \ + --no-warn-script-location \ + --ignore-installed \ + --no-compile \ + --no-deps \ + --root="$pkgdir" \ + --prefix=/usr \ + --no-index \ + --find-links="file://$startdir/dist" \ + $_pkgname } diff --git a/packages/python-pypdf2/PKGBUILD b/packages/python-pypdf2/PKGBUILD index 47987178003..b9314bda34a 100644 --- a/packages/python-pypdf2/PKGBUILD +++ b/packages/python-pypdf2/PKGBUILD @@ -4,8 +4,8 @@ pkgbase=python-pypdf2 pkgname=('python2-pypdf2' 'python-pypdf2') _pkgname=PyPDF2 -pkgver=3.0.1 -pkgrel=3 +pkgver=1.28.5 +pkgrel=2 epoch=1 pkgdesc='PDF toolkit.' arch=('any') @@ -13,7 +13,7 @@ url='http://mstamy2.github.com/PyPDF2' license=('BSD') makedepends=('python2-setuptools' 'python-setuptools') source=("https://files.pythonhosted.org/packages/source/${_pkgname::1}/$_pkgname/PyPDF2-$pkgver.tar.gz") -sha512sums=('8bca23a7aef28ebb724d1a2579a6d2fa7e8ae0530b6410ef54d88b46674aab726c37c2407107c3243ad52a7ebed4e19fdad01b4124145fc8fce12cb3b141d008') +sha512sums=('e1632b488c0259606c8c4dd2d071d10842b026288c2070793281bfe8bc1799f91cb7e94f598cb0edce983352cc4728671ee5d07006de74d589911f925c261354') prepare() { cp -a "$_pkgname-$pkgver"{,-2} diff --git a/packages/python-pysha3/PKGBUILD b/packages/python-pysha3/PKGBUILD index 091c4e443c2..8e3517c05f3 100644 --- a/packages/python-pysha3/PKGBUILD +++ b/packages/python-pysha3/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=python-pysha3 pkgname=('python2-pysha3' 'python-pysha3') _pkgname=pysha3 pkgver=1.0.2 -pkgrel=8 +pkgrel=7 pkgdesc='SHA-3 (Keccak) for Python 2.7 - 3.5.' arch=('x86_64' 'aarch64') url='https://pypi.org/project/pysha3/#files' @@ -33,8 +33,7 @@ package_python2-pysha3() { cd "$_pkgname-$pkgver-2" - python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 \ - --skip-build + python2 setup.py install --root="$pkgdir" --prefix=/usr -O1 --skip-build } package_python-pysha3() { @@ -42,7 +41,6 @@ package_python-pysha3() { cd "$_pkgname-$pkgver" - python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 \ - --skip-build + python setup.py install --root="$pkgdir" --prefix=/usr -O1 --skip-build } diff --git a/packages/python-pyside/PKGBUILD b/packages/python-pyside/PKGBUILD index e28ed31da6d..21b87fa3e1f 100644 --- a/packages/python-pyside/PKGBUILD +++ b/packages/python-pyside/PKGBUILD @@ -14,7 +14,7 @@ _pkgrealname=pyside pkgver=1.2.4 _qtver=4.8 _pyver=3.11 -pkgrel=16 +pkgrel=14 arch=('x86_64' 'aarch64') license=('LGPL') url='https://wiki.qt.io/PySide' diff --git a/packages/python-pysqlite3/PKGBUILD b/packages/python-pysqlite3/PKGBUILD index 06fa720ac93..71a0ed2fa72 100644 --- a/packages/python-pysqlite3/PKGBUILD +++ b/packages/python-pysqlite3/PKGBUILD @@ -1,50 +1,39 @@ # This file is part of BlackArch Linux ( https://www.blackarch.org/ ). # See COPYING for license details. -pkgbase=python-pysqlite3 -pkgname=('python2-pysqlite3' 'python-pysqlite3') +pkgname=python-pysqlite3 _pkgname=pysqlite3 pkgver=0.5.1 -pkgrel=2 +pkgrel=1 pkgdesc='DB-API 2.0 interface for Sqlite 3.x.' arch=('x86_64' 'aarch64') url='https://pypi.org/project/pysqlite3/#files' license=('zlib/libpng') -makedepends=('python2-setuptools' 'python-setuptools') +depends=('python' 'sqlite') +makedepends=('python-pip' 'python-build' 'python-wheel') source=("https://files.pythonhosted.org/packages/source/${_pkgname::1}/$_pkgname/$_pkgname-$pkgver.tar.gz") sha512sums=('e1c953582be8b25d7e4506e5e01381f87259f61533c34d59d2138265a726e898c568b7d055f79e741b3be430dd300dfb0cd4fc8697e2d0b77c735f707bdae87d') -prepare() { - cp -a "$_pkgname-$pkgver"{,-2} -} - build() { - cd "$_pkgname-$pkgver-2" - - python2 setup.py build - - cd "$srcdir/$_pkgname-$pkgver" - - python setup.py build -} - -package_python2-pysqlite3() { - depends=('python2' 'sqlite') - - cd "$_pkgname-$pkgver-2" - - python2 setup.py install --prefix=/usr --root="$pkgdir" -O1 --skip-build + cd "$_pkgname-$pkgver" - install -Dm 644 LICENSE "$pkgdir/usr/share/${pkgname[0]}/LICENSE" + python -m build --wheel --outdir="$startdir/dist" } -package_python-pysqlite3() { - depends=('python' 'sqlite') - +package() { cd "$_pkgname-$pkgver" - python setup.py install --prefix=/usr --root="$pkgdir" -O1 --skip-build - - install -Dm 644 LICENSE "$pkgdir/usr/share/${pkgname[1]}/LICENSE" + pip install \ + --verbose \ + --disable-pip-version-check \ + --no-warn-script-location \ + --ignore-installed \ + --no-compile \ + --no-deps \ + --root="$pkgdir" \ + --prefix=/usr \ + --no-index \ + --find-links="file://$startdir/dist" \ + $_pkgname } diff --git a/packages/python-pytanque/PKGBUILD b/packages/python-pytanque/PKGBUILD index 432689861bc..17ee0d22fb5 100644 --- a/packages/python-pytanque/PKGBUILD +++ b/packages/python-pytanque/PKGBUILD @@ -4,25 +4,36 @@ pkgname=python-pytanque _pkgname=pytanque pkgver=1.1.0 -pkgrel=5 +pkgrel=4 pkgdesc='The petanque static python bindings.' url='https://pypi.org/project/pytanque/#files' arch=('x86_64' 'aarch64') license=('BSD') depends=('python') -makedepends=('python-setuptools') +makedepends=('python-pip' 'python-build' 'python-wheel') source=("https://files.pythonhosted.org/packages/source/${_pkgname::1}/$_pkgname/$_pkgname-$pkgver.tar.gz") sha512sums=('b7c2aa55b0207375600a69827aa855877d2e8a416c6c52f48c5707205cf2adff5a3e1455763ef46637ec32ccd2cfd2b74a1d080500689986eb6dce74404e3f8b') build() { cd "$_pkgname-$pkgver" - python setup.py build + python -m build --wheel --outdir="$startdir/dist" } package() { cd "$_pkgname-$pkgver" - python setup.py install --root="$pkgdir" --prefix=/usr -O1 --skip-build + pip install \ + --verbose \ + --disable-pip-version-check \ + --no-warn-script-location \ + --ignore-installed \ + --no-compile \ + --no-deps \ + --root="$pkgdir" \ + --prefix=/usr \ + --no-index \ + --find-links="file://$startdir/dist" \ + $_pkgname } diff --git a/packages/python-python-cli-ui/PKGBUILD b/packages/python-python-cli-ui/PKGBUILD index 5980ff0c8ea..81e880aa76c 100644 --- a/packages/python-python-cli-ui/PKGBUILD +++ b/packages/python-python-cli-ui/PKGBUILD @@ -2,26 +2,39 @@ # See COPYING for license details. pkgname=python-python-cli-ui +_pkgname=python-cli-ui pkgver=0.7.5 -pkgrel=6 +pkgrel=5 pkgdesc='Build nice user interfaces in the terminal.' url='http://github.com/TankerApp/python-cli-ui' arch=('any') license=('MIT') depends=('python' 'python-colorama' 'python-unidecode' 'python-tabulate') -makedepends=('python-setuptools') -source=("https://files.pythonhosted.org/packages/source/${_pkgname::1}/$_pkgname/python-cli-ui-0.7.5.tar.gz") +makedepends=('python-pip' 'python-build' 'python-wheel') +source=("https://files.pythonhosted.org/packages/source/${_pkgname::1}/$_pkgname/$_pkgname-$pkgver.tar.gz") sha512sums=('a7c11ab26b800c213dffafb9ec15cc4dc34999518ff0c8288425dba46b5d76c1d75f6d91e40686740f2263419f41986cc5dcceedd40f64d0e0d53aa2476fe619') build() { - cd "python-cli-ui-$pkgver" + cd "$_pkgname-$pkgver" - python setup.py build + python -m build --wheel --outdir="$startdir/dist" } package() { - cd "python-cli-ui-$pkgver" + cd "$_pkgname-$pkgver" - python setup.py install --root="$pkgdir" --optimize=1 + pip install \ + --verbose \ + --disable-pip-version-check \ + --no-warn-script-location \ + --ignore-installed \ + --no-compile \ + --no-deps \ + --root="$pkgdir" \ + --prefix=/usr \ + --no-index \ + --find-links="file://$startdir/dist" \ + $_pkgname } + diff --git a/packages/python-python-magic/PKGBUILD b/packages/python-python-magic/PKGBUILD index ca807c20313..9aec868cfe7 100644 --- a/packages/python-python-magic/PKGBUILD +++ b/packages/python-python-magic/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=python-python-magic pkgname=('python2-python-magic' 'python-python-magic') _pkgname=python-magic -pkgver=0.4.27 +pkgver=0.4.18 _pyver=3.11 pkgrel=4 pkgdesc='File type identification using libmagic.' @@ -14,7 +14,7 @@ license=('MIT') makedepends=('python2-setuptools' 'python-setuptools' 'python2-pip' 'python-pip' 'python2-wheel' 'python-wheel') source=("https://files.pythonhosted.org/packages/source/${_pkgname::1}/$_pkgname/$_pkgname-$pkgver.tar.gz") -sha512sums=('2aea0a87f010b4624bdf6de18e4effd23282265089aea3d666abd8d74742d7f89c7abd1146e17a405653278d777663b2cb59afd812d6c8885ea034c318088b1f') +sha512sums=('18c4d75bc762d44f42c44bb52b999930ea570d2dd11d7cb840807e372806dc14164e1b3ea0acb23ccd692177a1a683d4537b01675bc57f06334bcc0f40520e6c') prepare() { cp -a "$_pkgname-$pkgver"{,-2} @@ -38,7 +38,6 @@ package_python2-python-magic() { python2 setup.py install --root="$pkgdir" --prefix=/usr -O1 --skip-build mkdir -p "$pkgdir/usr/lib/python2.7/site-packages/"{python-magic,python_magic} - cp -af magic.py* "$pkgdir/usr/lib/python2.7/site-packages/python-magic/" cp -af magic.py* "$pkgdir/usr/lib/python2.7/site-packages/python_magic/" find $pkgdir -type d -name '__pycache__' -exec rm -rf {} + rm -f "$pkgdir/usr/lib/python2.7/site-packages/magic."{py,pyc,pyo} @@ -52,7 +51,6 @@ package_python-python-magic() { python setup.py install --root="$pkgdir" --prefix=/usr -O1 --skip-build mkdir -p "$pkgdir/usr/lib/python$_pyver/site-packages/"{python-magic,python_magic} - cp -af magic.py* "$pkgdir/usr/lib/python$_pyver/site-packages/python-magic/" cp -af magic.py* "$pkgdir/usr/lib/python$_pyver/site-packages/python_magic/" find $pkgdir -type d -name '__pycache__' -exec rm -rf {} + rm -f "$pkgdir/usr/lib/python$_pyver/site-packages/magic.py" diff --git a/packages/python-python-nmap/PKGBUILD b/packages/python-python-nmap/PKGBUILD index 07fdc48c062..2669a657e45 100644 --- a/packages/python-python-nmap/PKGBUILD +++ b/packages/python-python-nmap/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=python-python-nmap pkgname=('python2-python-nmap' 'python-python-nmap') _pkgname=python-nmap -pkgver=0.7.1 +pkgver=0.6.4 pkgrel=3 pkgdesc='Python class to use nmap and access scan results from python3.' arch=('any') @@ -13,7 +13,7 @@ license=('GPL3') makedepends=('python2-setuptools' 'python-setuptools' 'python2-pip' 'python-pip' 'python2-wheel' 'python-wheel') source=("https://files.pythonhosted.org/packages/source/${_pkgname::1}/$_pkgname/$_pkgname-$pkgver.tar.gz") -sha512sums=('3a1d3b7120527d56148ddf3589bf8c4b749bb549e93c65a973d3edacb492656d0060d82606f88c5d1342dabdce00b8957bf09e01a5ce42f3a670ff3778d9e0ea') +sha512sums=('9c5176087e39271015283abcd8fc4d7828c063e9209ec1e549737142864e199a78014c2ab518f9afcb75f2ea2affc94fa1f612c9d2849d25eed9589a03864b76') prepare() { cp -a "$_pkgname-$pkgver"{,-2} diff --git a/packages/python-request/PKGBUILD b/packages/python-request/PKGBUILD index 518bc70b8af..47b2dc78f54 100644 --- a/packages/python-request/PKGBUILD +++ b/packages/python-request/PKGBUILD @@ -4,26 +4,37 @@ pkgname=python-request _pkgname=request pkgver=1.0.117 -pkgrel=5 +pkgrel=4 epoch=1 pkgdesc='HTTP request (GET+POST) dict.' arch=('any') url='https://pypi.org/project/request/#files' license=('BSD') depends=('python') -makedepends=('python-setuptools') +makedepends=('python-pip' 'python-build' 'python-wheel') source=("https://files.pythonhosted.org/packages/source/${_pkgname::1}/$_pkgname/$_pkgname-$pkgver.tar.gz") sha512sums=('337fbe1db2b785f4896326ba1a798d20876484cd3c7b8333c205eea79dfe01194db5e417dc30f73a4000d26adfcb650d7e7fe3865ed836e383dc28667a50e128') build() { cd "$_pkgname-$pkgver" - python setup.py build + python -m build --wheel --outdir="$startdir/dist" } package() { cd "$_pkgname-$pkgver" - python setup.py install --prefix=/usr --root="$pkgdir" -O1 --skip-build + pip install \ + --verbose \ + --disable-pip-version-check \ + --no-warn-script-location \ + --ignore-installed \ + --no-compile \ + --no-deps \ + --root="$pkgdir" \ + --prefix=/usr \ + --no-index \ + --find-links="file://$startdir/dist" \ + $_pkgname } diff --git a/packages/python-requests-cache/PKGBUILD b/packages/python-requests-cache/PKGBUILD index efdaa673202..13f5fd6a99b 100644 --- a/packages/python-requests-cache/PKGBUILD +++ b/packages/python-requests-cache/PKGBUILD @@ -1,48 +1,39 @@ # This file is part of BlackArch Linux ( https://www.blackarch.org/ ). # See COPYING for license details. -pkgbase=python-requests-cache -pkgname=('python2-requests-cache' 'python-requests-cache') -_pkgname=requests-cache +pkgname=python-requests-cache +_pkgname=requests_cache pkgver=1.1.0 -pkgrel=2 +pkgrel=1 pkgdesc='Persistent cache for requests library.' arch=('any') url='https://pypi.org/project/requests-cache/#files' license=('BSD') -makedepends=('python2-setuptools' 'python-setuptools') +depends=('python' 'python-requests') +makedepends=('python-pip' 'python-build' 'python-wheel') source=("https://files.pythonhosted.org/packages/source/${_pkgname::1}/$_pkgname/$_pkgname-$pkgver.tar.gz") sha512sums=('961b9a140856022328f113bdd708068ffb34be7b5ef6782791334c0d75d7f976c010d72378d1a72359b10a3f8433ac1472eb54629f428a09155fa456d8035204') -prepare() { - cp -a "$_pkgname-$pkgver"{,-2} -} - build() { - cd "$_pkgname-$pkgver-2" - - python2 setup.py build - - cd "$srcdir/$_pkgname-$pkgver" - - python setup.py build -} - -package_python2-requests-cache() { - depends=('python2' 'python2-requests') - - cd "$_pkgname-$pkgver-2" + cd "$_pkgname-$pkgver" - python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 \ - --skip-build + python -m build --wheel --outdir="$startdir/dist" } -package_python-requests-cache() { - depends=('python' 'python-requests') - +package() { cd "$_pkgname-$pkgver" - python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 \ - --skip-build + pip install \ + --verbose \ + --disable-pip-version-check \ + --no-warn-script-location \ + --ignore-installed \ + --no-compile \ + --no-deps \ + --root="$pkgdir" \ + --prefix=/usr \ + --no-index \ + --find-links="file://$startdir/dist" \ + $_pkgname } diff --git a/packages/python-requirements-parser/PKGBUILD b/packages/python-requirements-parser/PKGBUILD index e1b7254aa2d..f799eb93b3d 100644 --- a/packages/python-requirements-parser/PKGBUILD +++ b/packages/python-requirements-parser/PKGBUILD @@ -1,32 +1,40 @@ # This file is part of BlackArch Linux ( https://www.blackarch.org/ ). # See COPYING for license details. -pkgbase=python-requirements-parser -pkgname=('python2-requirements-parser' 'python-requirements-parser') +pkgname=python-requirements-parser +_pkgname=requirements-parser pkgver=0.5.0 -pkgrel=3 +pkgrel=1 pkgdesc='A Pip requirements file parser.' arch=('any') url='https://pypi.org/project/requirements-parser' license=('BSD') -makedepends=('python2-setuptools' 'python-setuptools') +depends=('python') +makedepends=('python-pip' 'python-build' 'python-wheel') options=(!emptydirs) source=("https://files.pythonhosted.org/packages/source/${_pkgname::1}/$_pkgname/$_pkgname-$pkgver.tar.gz") sha512sums=('a3bed4f26efb738cf09933770d11ccbe0c2d2b64936865979a8071b3478f26fb6f9780459d316eb5aa907eecf089b0e92fb1bb945b108b9ef71fee74b564a763') -package_python2-requirements-parser() { - depends=('python2') +build() { + cd "$_pkgname-$pkgver" - cd "requirements-parser-$pkgver" - - python2 setup.py install --root="$pkgdir" --optimize=1 + python -m build --wheel --outdir="$startdir/dist" } -package_python-requirements-parser() { - depends=('python') - - cd "requirements-parser-$pkgver" - - python setup.py install --root="$pkgdir" --optimize=1 +package() { + cd "$_pkgname-$pkgver" + + pip install \ + --verbose \ + --disable-pip-version-check \ + --no-warn-script-location \ + --ignore-installed \ + --no-compile \ + --no-deps \ + --root="$pkgdir" \ + --prefix=/usr \ + --no-index \ + --find-links="file://$startdir/dist" \ + $_pkgname } diff --git a/packages/python-rlp/PKGBUILD b/packages/python-rlp/PKGBUILD index 55e7eeacdfb..eb8383e7368 100644 --- a/packages/python-rlp/PKGBUILD +++ b/packages/python-rlp/PKGBUILD @@ -4,13 +4,13 @@ pkgname=python-rlp _pkgname=rlp pkgver=3.0.0 -pkgrel=3 +pkgrel=2 pkgdesc='A package for Recursive Length Prefix encoding and decoding.' url='https://pypi.org/project/rlp/#files' arch=('any') license=('MIT') depends=('python' 'python-eth-utils') -makedepends=('python-setuptools' 'python-pip' 'python-wheel') +makedepends=('python-setuptools') source=("https://files.pythonhosted.org/packages/source/${_pkgname::1}/$_pkgname/$_pkgname-$pkgver.tar.gz") sha512sums=('f3f9027f08137cba31e651d5b438cfb296e0697ad36bd9296ef9c2d2a8e43178172cf528cafca4b6ad90714df08f02620a0349031149b349e943282198d70ea6')