diff --git a/packages/python-scikit-image/PKGBUILD b/packages/python-scikit-image/PKGBUILD index a5313c1657f..7f142cc9e56 100644 --- a/packages/python-scikit-image/PKGBUILD +++ b/packages/python-scikit-image/PKGBUILD @@ -2,9 +2,9 @@ # See COPYING for license details. pkgname=python-scikit-image -_pkgname=scikit-image +_pkgname=scikit_image pkgver=0.21.0 -pkgrel=2 +pkgrel=1 pkgdesc='Image processing routines for SciPy.' arch=('x86_64' 'aarch64') url='https://pypi.org/project/scikit-image/#files' @@ -12,19 +12,30 @@ license=('BSD') depends=('python' 'python-numpy' 'python-scipy' 'python-matplotlib' 'python-numpy' 'python-networkx' 'python-pillow' 'python-imageio' 'python-pywavelets') -makedepends=('python-setuptools' 'python-pip' 'python-wheel' 'python-numpy') +makedepends=('python-pip' 'python-build' 'python-wheel' 'python-numpy') source=("https://files.pythonhosted.org/packages/source/${_pkgname::1}/$_pkgname/$_pkgname-$pkgver.tar.gz") sha512sums=('3be52c341e68c951440885a810f3a2b52cafa1243701c192e3e9ade6bd248e7036ee5ea9ca26dbd754e3d9938ead7862e13e0155164c878a0de164c58a567bae') 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-scruffy/PKGBUILD b/packages/python-scruffy/PKGBUILD index 5948ff4831c..7e7a095ae66 100644 --- a/packages/python-scruffy/PKGBUILD +++ b/packages/python-scruffy/PKGBUILD @@ -2,28 +2,39 @@ # See COPYING for license details. pkgname=python-scruffy +_pkgname=scruffy pkgver=0.3 -pkgrel=9 +pkgrel=8 epoch=1 pkgdesc='A framework for taking care of a bunch of boilerplate in Python apps.' url='https://pypi.org/project/scruffy/#files' arch=('any') license=('MIT') depends=('python' 'python-yaml' 'python-six' 'graphviz' 'plotutils') -makedepends=('python-setuptools' 'graphviz' 'plotutils') +makedepends=('python-pip' 'python-build' 'python-wheel' 'graphviz' 'plotutils') source=("https://files.pythonhosted.org/packages/source/${_pkgname::1}/$_pkgname/scruffy-$pkgver.tar.gz") sha512sums=('7f3f955bddc0fe295147aca98391bc0159b469a719e44891f89592321af2f0e3eaf44bdd2ff43dd749440e7f7fa5587f3b8ff2828d7ac23bf066820e00446317') build() { - cd "scruffy-$pkgver" + cd "$_pkgname-$pkgver" - python setup.py build + python -m build --wheel --outdir="$startdir/dist" } package() { - cd "scruffy-$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-sip-pyqt4/0001-Fix-compilation-against-Python-3.11.patch b/packages/python-sip-pyqt4/0001-Fix-compilation-against-Python-3.11.patch new file mode 100644 index 00000000000..a7412f77d97 --- /dev/null +++ b/packages/python-sip-pyqt4/0001-Fix-compilation-against-Python-3.11.patch @@ -0,0 +1,50 @@ +From a9c9e69ed89b481b7361d9aa4c1acbbd50e13e22 Mon Sep 17 00:00:00 2001 +From: LingMan +Date: Wed, 10 May 2023 20:53:10 +0200 +Subject: [PATCH] Fix compilation against Python 3.11+ + +With Python 3.11 the internal structure of PyFrameObject (AKA struct _frame) has been removed from +the public API. +De jure it was always an opaque struct but now there have also been de facto changes. + +From the sip side the change is simply to call the official PyFrame_GetBack API, but PyFrameObject +is returned as part of sip's API. Callers of `sip_api_get_frame` may thus need additional fixes if +they rely on PyFrameObject's internal structure. + +This change contains a fallback implementation of PyFrame_GetBack for Python 3.8 and older +(including 2.7) as documented here: +https://docs.python.org/3/whatsnew/3.11.html#whatsnew311-c-api-porting +--- + siplib/siplib.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/siplib/siplib.c b/siplib/siplib.c +index db52b68..b234a0b 100644 +--- a/siplib/siplib.c ++++ b/siplib/siplib.c +@@ -13737,6 +13737,13 @@ static int sip_api_is_user_type(const sipWrapperType *wt) + return wt->wt_user_type; + } + ++#if PY_VERSION_HEX < 0x030900B1 ++static inline PyFrameObject* PyFrame_GetBack(PyFrameObject *frame) ++{ ++ Py_XINCREF(frame->f_back); ++ return frame->f_back; ++} ++#endif + + /* + * Return a frame from the execution stack. +@@ -13747,7 +13754,7 @@ static struct _frame *sip_api_get_frame(int depth) + + while (frame != NULL && depth > 0) + { +- frame = frame->f_back; ++ frame = PyFrame_GetBack(frame); + --depth; + } + +-- +2.40.1 + diff --git a/packages/python-sip-pyqt4/PKGBUILD b/packages/python-sip-pyqt4/PKGBUILD index e3a4d8871a1..7d1672e3388 100644 --- a/packages/python-sip-pyqt4/PKGBUILD +++ b/packages/python-sip-pyqt4/PKGBUILD @@ -7,17 +7,22 @@ pkgbase=python-sip-pyqt4 pkgname=('python-sip-pyqt4' 'python2-sip-pyqt4') -pkgver=4.19.24 -pkgrel=4 -arch=('x86_64') +pkgver=4.19.25 +pkgrel=1 +arch=('x86_64' 'aarch64') url='http://www.riverbankcomputing.com/software/sip/intro' license=('custom:"sip"') makedepends=('python' 'python2') -source=("https://www.riverbankcomputing.com/static/Downloads/sip/$pkgver/sip-$pkgver.tar.gz") -sha256sums=('edcd3790bb01938191eef0f6117de0bf56d1136626c0ddb678f3a558d62e41e5') +source=("https://www.riverbankcomputing.com/static/Downloads/sip/$pkgver/sip-$pkgver.tar.gz" + '0001-Fix-compilation-against-Python-3.11.patch') +sha512sums=('60fb4133c68869bf0993144978b4847d94a0f9c7b477f64a346ea133cfe35bc11820204ab327dcf9a929b6f65a26d16cc7efbce65e49967c3347b39376e57001' + '5cc5fe8e5e5169a183f848623989ca7b5dc7a766fa2fc7b71dd3657e9fdb6986ac1e9de3b2c4ff3b4ed500a522b4b88f8fa2aaac33002ee6b7e607aca9c695de') prepare() { mkdir -p build-pyqt4{,-py2} + + cd "sip-$pkgver" + patch --strip=1 --input=../0001-Fix-compilation-against-Python-3.11.patch } build() { diff --git a/packages/python-spacy/PKGBUILD b/packages/python-spacy/PKGBUILD index 4c932928240..904b98a1d80 100644 --- a/packages/python-spacy/PKGBUILD +++ b/packages/python-spacy/PKGBUILD @@ -4,7 +4,7 @@ pkgname=python-spacy _pkgname=spacy pkgver=3.6.1 -pkgrel=2 +pkgrel=1 pkgdesc='Industrial-strength Natural Language Processing (NLP) in Python.' arch=('x86_64' 'aarch64') url='https://pypi.org/project/spacy/#files' @@ -13,19 +13,30 @@ depends=('python-catalogue' 'python-cymem' 'python-jinja' 'python-murmurhash' 'python-numpy' 'python-pathlib' 'python-plac' 'python-preshed' 'python-regex' 'python-requests' 'python-srsly' 'python-thinc' 'python-tqdm' 'python-typer' 'python-ujson' 'python-wasabi') -makedepends=('python-pip' 'python-wheel' 'cython' 'python-setuptools') +makedepends=('python-pip' 'python-build' 'python-wheel' 'cython') source=("https://files.pythonhosted.org/packages/source/${_pkgname::1}/$_pkgname/$_pkgname-$pkgver.tar.gz") sha512sums=('d3f609ab1192a2186153fba119a1882eb50a33bf1860d960f5fe42de8f80e9376fe2a619a533ac5ccf47c5b1c2c27a2e5a2052967c7173c13636392994560d7e') build() { - cd "$_pkgname-$pkgver" + cd "$_pkgname-$pkgver" - python setup.py build + python -m build --wheel --outdir="$startdir/dist" } package() { - cd "$_pkgname-$pkgver" + 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-speechrecognition/PKGBUILD b/packages/python-speechrecognition/PKGBUILD index 12ef8f49793..10706d37af0 100644 --- a/packages/python-speechrecognition/PKGBUILD +++ b/packages/python-speechrecognition/PKGBUILD @@ -4,15 +4,15 @@ pkgbase=python-speechrecognition pkgname=('python2-speechrecognition' 'python-speechrecognition') _pkgname=speech_recognition -pkgver=3.9.0 -pkgrel=3 +pkgver=3.8.1 +pkgrel=9 pkgdesc='Library for performing speech recognition, with support for several engines and APIs, online and offline.' arch=('any') url='https://pypi.org/project/speechrecognition/#files' license=('BSD') makedepends=('python2-setuptools' 'python-setuptools') source=("https://github.com/Uberi/speech_recognition/archive/$pkgver.tar.gz") -sha512sums=('de4f6b9d341f013e34ff67a65b459ac4895b8e8ac3682affdcb7f9c8dfd035ae26c821bb39966a0921c4b65e73ffcbbf2f8787f99568405f59ff61540e890729') +sha512sums=('555a4e7b2f0cb4f7adac8a0d7f1bc4071564a021a40b5ae75ea61e4b6a3b17b974672f0350ef06150bfa1711307e4af24603c8fc78aaf8a51fc82e73413815ac') prepare() { cp -a "$_pkgname-$pkgver"{,-2} diff --git a/packages/python-spoofmac/PKGBUILD b/packages/python-spoofmac/PKGBUILD index 71f68b91fbd..54f02847548 100644 --- a/packages/python-spoofmac/PKGBUILD +++ b/packages/python-spoofmac/PKGBUILD @@ -2,27 +2,38 @@ # See COPYING for license details. pkgname=python-spoofmac +_pkgname=SpoofMAC pkgver=2.1.1 -pkgrel=7 +pkgrel=6 pkgdesc='Easily spoof your MAC address in OS X, Windows & Linux.' url='https://pypi.org/project/SpoofMC/#files' arch=('any') license=('MIT') depends=('python') -makedepends=('python-setuptools') -source=("https://files.pythonhosted.org/packages/source/${_pkgname::1}/$_pkgname/SpoofMAC-$pkgver.tar.gz") +makedepends=('python-pip' 'python-build' 'python-wheel') +source=("https://files.pythonhosted.org/packages/source/${_pkgname::1}/$_pkgname/$_pkgname-$pkgver.tar.gz") sha512sums=('c283b0e65e6d8521180f8bf08f98048a53811f100416091232c1f5b75d944e084624c7244d6df1c73c5e1ba0f214e6518b7e930a8f9fb19dedcff5950655425e') build() { - cd "SpoofMAC-$pkgver" + cd "$_pkgname-$pkgver" - python setup.py build + python -m build --wheel --outdir="$startdir/dist" } package() { - cd "SpoofMAC-$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-stringdist/PKGBUILD b/packages/python-stringdist/PKGBUILD index 8ea44a469aa..b9f12238455 100644 --- a/packages/python-stringdist/PKGBUILD +++ b/packages/python-stringdist/PKGBUILD @@ -2,27 +2,38 @@ # See COPYING for license details. pkgname=python-stringdist +_pkgname=StringDist pkgver=1.0.9 -pkgrel=6 +pkgrel=5 pkgdesc='Several functions for calculating string distances.' arch=('any') url='https://pypi.org/project/StringDist/#files' license=('MIT') depends=('python') -makedepends=('python-setuptools') -source=("https://files.pythonhosted.org/packages/source/${_pkgname::1}/$_pkgname/StringDist-1.0.9.tar.gz") +makedepends=('python-pip' 'python-build' 'python-wheel') +source=("https://files.pythonhosted.org/packages/source/${_pkgname::1}/$_pkgname/$_pkgname-$pkgver.tar.gz") sha512sums=('8220409586c96590728a2706948d4c169cc84724c1dd74e98923362e433191201bb407c3efb43160de9227a21b68e16eea90f49e47e7ea32f2a08a34622561d7') build() { - cd "StringDist-$pkgver" + cd "$_pkgname-$pkgver" - python setup.py build + python -m build --wheel --outdir="$startdir/dist" } package() { - cd "StringDist-$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-textract/PKGBUILD b/packages/python-textract/PKGBUILD index 8036aa08fec..728acd922fd 100644 --- a/packages/python-textract/PKGBUILD +++ b/packages/python-textract/PKGBUILD @@ -4,7 +4,7 @@ pkgname=python-textract _pkgname=textract pkgver=1.6.5 -pkgrel=3 +pkgrel=2 pkgdesc='Extract text from any document. no muss. no fuss.' url='https://pypi.org/project/textract/#files' arch=('any') @@ -12,19 +12,38 @@ license=('MIT') depends=('python' 'python-argcomplete' 'python-beautifulsoup4' 'python-chardet' 'python-docx2txt' 'python-ebooklib' 'python-python-pptx' 'python-six' 'python-speechrecognition' 'python-xlrd') -makedepends=('python-setuptools') -source=("https://files.pythonhosted.org/packages/source/${_pkgname::1}/$_pkgname/$_pkgname-$pkgver.tar.gz") -sha512sums=('409b0f9a2c0560b7e49ce0bb004bdd16e4590d05db66cc99d9cdfb761a2f13248aa70bd55bdd280fae5401f0162e2d7f464f8e871e85f51de527687f0c9b2412') +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=('409b0f9a2c0560b7e49ce0bb004bdd16e4590d05db66cc99d9cdfb761a2f13248aa70bd55bdd280fae5401f0162e2d7f464f8e871e85f51de527687f0c9b2412' + '8c9552f82ae70033e015c7244f78035b460e244c91f56346c32b4aa8ec01dfeb1294a8e670437cd607930d1db0a955003fd2977e7d434d20c8c7c4889d56f6e9') + +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-textract/setup.py.patch b/packages/python-textract/setup.py.patch new file mode 100644 index 00000000000..e112874ba11 --- /dev/null +++ b/packages/python-textract/setup.py.patch @@ -0,0 +1,10 @@ +--- src/textract-1.6.5/setup.py 2022-03-10 11:30:08.000000000 +0100 ++++ setup.py 2023-09-01 18:42:50.963331708 +0200 +@@ -55,7 +55,6 @@ + 'textract', + 'textract.parsers', + ], +- install_requires=dependencies, + extras_require={ + "pocketsphinx": ["pocketsphinx==0.1.15"] + }, diff --git a/packages/python-thinc/PKGBUILD b/packages/python-thinc/PKGBUILD index e767a146d0d..3713e402f42 100644 --- a/packages/python-thinc/PKGBUILD +++ b/packages/python-thinc/PKGBUILD @@ -4,7 +4,7 @@ pkgname=python-thinc _pkgname=thinc pkgver=8.2.0 -pkgrel=2 +pkgrel=1 pkgdesc='Practical Machine Learning for NLP.' arch=('x86_64' 'aarch64') url='https://pypi.org/project/thinc/' @@ -13,19 +13,30 @@ depends=('python' 'python-cymem' 'python-blis' 'python-catalogue' 'python-hypothesis' 'python-mock' 'python-murmurhash' 'python-numpy' 'python-pathlib' 'python-plac' 'python-preshed' 'python-pydantic' 'python-six' 'python-srsly' 'python-tqdm' 'python-wasabi') -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=('a32abb2fb10442664b815b2340884b538894917155f21717d5091a0e4d72f64e8d2b2914fefcc45cbb9fc4e1140e04293c77f73ed984e47a7a6b2e0c7ddfb900') 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-trackerjacker/PKGBUILD b/packages/python-trackerjacker/PKGBUILD index 43949444ff2..a249de3fb26 100644 --- a/packages/python-trackerjacker/PKGBUILD +++ b/packages/python-trackerjacker/PKGBUILD @@ -2,15 +2,16 @@ # See COPYING for license details. pkgname=python-trackerjacker +_pkgname=trackerjacker pkgver=1.9.0 -pkgrel=6 +pkgrel=5 pkgdesc='Finds and tracks wifi devices through raw 802.11 monitoring.' groups=('blackarch' 'blackarch-wireless') arch=('any') url='https://github.com/calebmadrigal/trackerjacker' license=('MIT') depends=('python' 'python-scapy' 'python-pyaml' 'python-ruamel-yaml') -makedepends=('python-setuptools') +makedepends=('python-pip' 'python-build' 'python-wheel') source=("https://files.pythonhosted.org/packages/source/${_pkgname::1}/$_pkgname/trackerjacker-$pkgver.tar.gz") sha512sums=('26e067805f522aca75a9bf99f73c64a6c1c451c65a473f23cbcc6b975ac4e3490e462671967a306e80daa42d9109e7c0a2a5b271446eb01d7ba77ba423af58a2') @@ -21,15 +22,25 @@ prepare() { } build() { - cd "trackerjacker-$pkgver" + cd "$_pkgname-$pkgver" - python setup.py build + python -m build --wheel --outdir="$startdir/dist" } package() { - cd "trackerjacker-$pkgver" - - python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 \ - --skip-build + 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-user-agent/PKGBUILD b/packages/python-user-agent/PKGBUILD index 513a14b9208..b1c72c6e9f4 100644 --- a/packages/python-user-agent/PKGBUILD +++ b/packages/python-user-agent/PKGBUILD @@ -3,26 +3,28 @@ pkgbase=python-user-agent pkgname=('python2-user-agent' 'python-user-agent') -pkgver=0.1.10 -pkgrel=3 +_pkgname=user-agent +__pkgname=user_agent +pkgver=0.1.9 +pkgrel=5 pkgdesc='User-Agent generator.' arch=('any') url='https://pypi.org/project/user_agent/#files' license=('MIT') makedepends=('python2-setuptools' 'python-setuptools') source=("https://files.pythonhosted.org/packages/source/${_pkgname::1}/$_pkgname/user_agent-$pkgver.tar.gz") -sha512sums=('44331d2cbec7779c9370032c91027c634ab86cb886fdf631708d0a7457d23410910b51a6466b535dc5a14e4b55ddf15246b0e0d6cf3cc824b5162906bdad17a4') +sha512sums=('54d273ba1eec260591f3f1fd04cd9894713129d017f2910be04aa0342287bd17fcc75dc44c627c54bf19dc872db55ab9c4965eaa1a3976e6fca91ebcc7c99a48') prepare() { - cp -a "user_agent-$pkgver" "user_agent2-$pkgver" + cp -a "$__pkgname-$pkgver"{,-2} } build() { - cd "user_agent2-$pkgver" + cd "$__pkgname-$pkgver-2" python2 setup.py build - cd "$srcdir/user_agent-$pkgver" + cd "$srcdir/$__pkgname-$pkgver" python setup.py build } @@ -30,18 +32,16 @@ build() { package_python2-user-agent() { depends=('python2-six') - cd "user_agent2-$pkgver" + 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-user-agent() { depends=('python-six') - cd "user_agent-$pkgver" + 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-veryprettytable/PKGBUILD b/packages/python-veryprettytable/PKGBUILD index 8e591848119..ca926afe252 100644 --- a/packages/python-veryprettytable/PKGBUILD +++ b/packages/python-veryprettytable/PKGBUILD @@ -2,8 +2,9 @@ # See COPYING for license details. pkgname=python-veryprettytable +_pkgname=veryprettytable pkgver=0.8.1 -pkgrel=7 +pkgrel=6 pkgdesc='A simple Python library for easily displaying tabular data in a visually appealing ASCII table format.' url='https://pypi.org/project/veryprettytable/#files' arch=('any') @@ -14,15 +15,25 @@ source=("https://files.pythonhosted.org/packages/source/${_pkgname::1}/$_pkgname sha512sums=('ebdf031da50bc7e0894ea8bd1df34102ee04e11176d755c5ee04143d21af17cd40cb85b28e1bfb3a29d08d1e63d2841d4ed3a67960f76b0efe68a42e30a3dbf5') build() { - cd "veryprettytable-$pkgver" + cd "$_pkgname-$pkgver" - python setup.py build + python -m build --wheel --outdir="$startdir/dist" } package() { - cd "veryprettytable-$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-wincertstore/PKGBUILD b/packages/python-wincertstore/PKGBUILD index 86b1f3dc913..866fea836a1 100644 --- a/packages/python-wincertstore/PKGBUILD +++ b/packages/python-wincertstore/PKGBUILD @@ -1,8 +1,7 @@ # This file is part of BlackArch Linux ( https://www.blackarch.org/ ). # See COPYING for license details. -pkgbase=python-wincertstore -pkgname=('python2-wincertstore' 'python-wincertstore') +pkgname=python-wincertstore _pkgname=wincertstore pkgver=0.2.1 pkgrel=4 @@ -10,37 +9,39 @@ pkgdesc="Python module to extract CA and CRL certs from Windows' cert store (cty arch=('any') url='https://pypi.org/project/wincertstore/#files' license=('PSF') -makedepends=('python2-setuptools' 'python-setuptools') -source=("https://files.pythonhosted.org/packages/source/${_pkgname::1}/$_pkgname/$_pkgname-$pkgver.zip") -sha512sums=('e4c59a9d3ae953ebd2a5db92c037c2a444a90da08a4bf4bb7ee076deeaf5376e14a5f2ae5638f753ad77f64dab6108de8b4104d287ed15b1619142d2292f8e73') +depends=('python') +makedepends=('python-pip' 'python-build' 'python-wheel') +source=("https://files.pythonhosted.org/packages/source/${_pkgname::1}/$_pkgname/$_pkgname-$pkgver.zip" + 'setup.py.patch') +sha512sums=('e4c59a9d3ae953ebd2a5db92c037c2a444a90da08a4bf4bb7ee076deeaf5376e14a5f2ae5638f753ad77f64dab6108de8b4104d287ed15b1619142d2292f8e73' + 'ec746049cca3269c4ab70b2402c661b325b6f437021ff02e5a06f6d71496272ec4561557f2645b279920d51e352b0bda3e2ce4238d6d6ab8b9feb8cca6dc0351') prepare() { - cp -a "$_pkgname-$pkgver"{,-2} -} - -build() { - cd "$_pkgname-$pkgver-2" - - python2 setup.py build - - cd "$srcdir/$_pkgname-$pkgver" + cd "$_pkgname-$pkgver" - python setup.py build + patch -p0 < ../setup.py.patch } -package_python2-wincertstore() { - depends=('python2') - - cd "$_pkgname-$pkgver-2" +build() { + cd "$_pkgname-$pkgver" - python2 setup.py install --prefix=/usr --root="$pkgdir" -O1 --skip-build + python -m build --wheel --outdir="$startdir/dist" } -package_python-wincertstore() { - 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-wincertstore/setup.py.patch b/packages/python-wincertstore/setup.py.patch new file mode 100644 index 00000000000..1dc5d5c8bce --- /dev/null +++ b/packages/python-wincertstore/setup.py.patch @@ -0,0 +1,10 @@ +--- src/wincertstore-0.2.1/setup.py 2021-06-08 12:00:02.000000000 +0200 ++++ setup.py 2023-09-01 18:29:56.313331707 +0200 +@@ -53,7 +53,6 @@ + license="PSFL", + description="Python module to extract CA and CRL certs from Windows' cert store (ctypes based).", + long_description="\n".join(long_description), +- python_requires='>=2.7,!=3.0.*,!=3.1.*,<3.4.*', + classifiers=[ + "Development Status :: 4 - Beta", + "Intended Audience :: Developers", diff --git a/packages/python-wireless/PKGBUILD b/packages/python-wireless/PKGBUILD index 92668e075ab..33d09a0b6bb 100644 --- a/packages/python-wireless/PKGBUILD +++ b/packages/python-wireless/PKGBUILD @@ -2,27 +2,38 @@ # See COPYING for license details. pkgname=python-wireless +_pkgname=wireless pkgver=0.3.3 -pkgrel=6 +pkgrel=5 pkgdesc='A dead simple, cross-platform Python library to connect to wireless networks.' url='https://pypi.org/project/wireless/#files' arch=('any') license=('Apache') depends=('python') -makedepends=('python-setuptools') +makedepends=('python-pip' 'python-build' 'python-wheel') source=("https://files.pythonhosted.org/packages/source/${_pkgname::1}/$_pkgname/wireless-0.3.3.tar.gz") sha512sums=('e5f89052dd7f649e92fd2a3ec2657bfc8f891310570572b23eb9fb8e83358f9ea48fdc249e5dc1031393dbb3c37689fa71b186e5097da558525e2526437f742a') build() { - cd "wireless-$pkgver" + cd "$_pkgname-$pkgver" - python setup.py build + python -m build --wheel --outdir="$startdir/dist" } package() { - cd "wireless-$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-xmp-toolkit/PKGBUILD b/packages/python-xmp-toolkit/PKGBUILD index 4caf7454634..fefb5d73a49 100644 --- a/packages/python-xmp-toolkit/PKGBUILD +++ b/packages/python-xmp-toolkit/PKGBUILD @@ -3,23 +3,36 @@ pkgname=python-xmp-toolkit pkgver=2.0.1 -pkgrel=6 +pkgrel=5 pkgdesc='A library for working with XMP metadata.' arch=('any') -url='http://python-xmp-toolkit.readthedocs.org/' +url='https://pypi.org/project/python-xmp-toolkit/' license=(custom) depends=('python' 'exempi' 'python-pytz') -makedepends=('python-setuptools') -source=("https://files.pythonhosted.org/packages/source/${_pkgname::1}/$_pkgname/$pkgname-$pkgver.tar.gz") +makedepends=('python-pip' 'python-build' 'python-wheel') +source=("https://files.pythonhosted.org/packages/source/${pkgname::1}/$pkgname/$pkgname-$pkgver.tar.gz") sha512sums=('79dd3b4ba57e48af8980e25cf55215ed7bc654843354a54c0e8688bdcec1ac16e602a7e7d9d7bd83e9e424f189372c576ccef395e0bb220d3545c1135eff320a') build() { - cd $pkgname-$pkgver - python setup.py build + cd "$pkgname-$pkgver" + + python -m build --wheel --outdir="$startdir/dist" } package() { - cd $pkgname-$pkgver - python setup.py install --root="$pkgdir" --prefix=/usr --optimize=1 + 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/shiboken/PKGBUILD b/packages/shiboken/PKGBUILD index b7f22c50212..f65648c7e75 100644 --- a/packages/shiboken/PKGBUILD +++ b/packages/shiboken/PKGBUILD @@ -6,16 +6,16 @@ pkgname=('python2-shiboken' 'python-shiboken') _pkgname=Shiboken pkgver=1.2.4 _pyver=3.11 -pkgrel=11 +pkgrel=10 arch=('x86_64') license=('LGPL') url='https://github.com/pyside/Shiboken/tags' depends=('libicu64') -makedepends=('cmake' 'python2' 'python' 'qt4' 'libxslt') +makedepends=('cmake' 'python2' 'python' 'qt4' 'libxslt' 'openssl') source=("$pkgbase-$pkgver.tar.gz::https://github.com/PySide/Shiboken/archive/$pkgver.tar.gz" 'support-new-python.diff') sha512sums=('daa3fadf3daffaec52f199c0285a37431a4b6b0d450a43a035f49e5505a35b666a1cb0b334c7267af7530841dadbf0b97296812141c93de3b7cd07c7d9016a2a' - 'f88ff9f9cbc3856029ba2d2b2d1bb1ecdc43ea743e175c14c867d0a57313f8398a2b2738e0e3f20066f0ae6953c112d86c6493132e68accff91daa9ac57ef870') + '1829f69b1c57fd4225f17cb66121f80d7b073e70f78f9b7755102dc38371e1948c2e901bb95186d3e74e73250ff3f9068a49647f02dc5cd2f7b4a164093d88d5') prepare() { cd "$_pkgname-$pkgver" @@ -43,10 +43,10 @@ build() { cmake ../ -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \ -DBUILD_TESTS=OFF -DUSE_PYTHON3=yes -DQT_QMAKE_EXECUTABLE=qmake-qt4 \ -DUSE_PYTHON_VERSION=3 -DPYTHON_EXECUTABLE=/usr/bin/python3 \ - -DPYTHON3_INCLUDE_DIR=/usr/include/python$_pyver \ - -DPYTHON3_LIBRARY=/usr/lib/python$_pyver \ - -DPYTHON_INCLUDE_DIR=/usr/include/python$_pyver \ - -DPYTHON_LIBRARY=/usr/lib/python$_pyver + -DPYTHON3_INCLUDE_DIR="/usr/include/python$_pyver" \ + -DPYTHON3_LIBRARY="/usr/lib/python$_pyver" \ + -DPYTHON_INCLUDE_DIR="/usr/include/python$_pyver" \ + -DPYTHON_LIBRARY="/usr/lib/python$_pyver" make -j1 } diff --git a/packages/shiboken/support-new-python.diff b/packages/shiboken/support-new-python.diff index 47adc3ac87c..3a008396691 100644 --- a/packages/shiboken/support-new-python.diff +++ b/packages/shiboken/support-new-python.diff @@ -5,7 +5,25 @@ # CMAKE_FIND_FRAMEWORKS(Python) -FOREACH(_CURRENT_VERSION 3.4 3.3 3.2 3.1 3.0) -+FOREACH(_CURRENT_VERSION 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) ++FOREACH(_CURRENT_VERSION 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) IF(_CURRENT_VERSION GREATER 3.1) SET(_32FLAGS "m" "u" "mu" "dm" "du" "dmu" "") ELSE() +--- a/libshiboken/sbkenum.cpp 2021-02-09 14:52:17.062065563 -> ++++ b/libshiboken/sbkenum.cpp 2021-02-09 14:52:59.965800766 -> +@@ -527,9 +527,15 @@ + { + PyTypeObject* type = reinterpret_cast(new SbkEnumType); + ::memset(type, 0, sizeof(SbkEnumType)); ++ #ifdef IS_PY3K ++ Py_SET_TYPE(type, &SbkEnumType_Type); ++ #else + Py_TYPE(type) = &SbkEnumType_Type; ++ #endif + type->tp_basicsize = sizeof(SbkEnumObject); ++ #ifndef IS_PY3K + type->tp_print = &SbkEnumObject_print; ++ #endif + type->tp_repr = &SbkEnumObject_repr; + type->tp_str = &SbkEnumObject_repr; + type->tp_flags = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_CHECKTYPES;