From efc22702de0ff7fa08783283555af19359eafe8b Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Tue, 7 Aug 2018 08:05:47 +0200 Subject: recompile all python packages --- ipython-ipyparallel/PKGBUILD | 37 +++++++++++++++++++--- jupyterhub/PKGBUILD | 6 ++-- pssh-git/PKGBUILD | 8 +++-- python-asteval/PKGBUILD | 22 +++++++++++-- python-fabio/PKGBUILD | 14 ++++++++- python-lmfit/PKGBUILD | 44 +++++++++++++++++++------- python-oauth2/PKGBUILD | 20 +++++++----- python-pamela/PKGBUILD | 8 +++-- python-peakutils/PKGBUILD | 29 ++++++++++++++--- python-postpic/PKGBUILD | 28 ++++++++++++----- python-pyfai/PKGBUILD | 14 ++++++++- python-pyfftw/PKGBUILD | 39 +++++++++++++++++++---- python-pywavelets/PKGBUILD | 22 +++++++++++-- python-scikit-image/PKGBUILD | 49 +++++++++++++++++++++++------ python-silx/PKGBUILD | 14 ++++++++- python-simplepam/PKGBUILD | 8 +++-- python-sphinxcontrib-programoutput/PKGBUILD | 26 ++++++++++----- python2-wxmplot/PKGBUILD | 3 +- python2-wxutils/PKGBUILD | 3 +- xraylarch/PKGBUILD | 3 +- 20 files changed, 319 insertions(+), 78 deletions(-) diff --git a/ipython-ipyparallel/PKGBUILD b/ipython-ipyparallel/PKGBUILD index f03fcf04..5b24b175 100644 --- a/ipython-ipyparallel/PKGBUILD +++ b/ipython-ipyparallel/PKGBUILD @@ -3,12 +3,33 @@ pkgbase=ipython-ipyparallel pkgname=('ipython-ipyparallel' 'ipython2-ipyparallel' 'ipython-ipyparallel-common') pkgver=6.2.2 -pkgrel=1 +pkgrel='2' pkgdesc="Interactive Parallel Computing in Python" url="https://github.com/ipython/ipyparallel" arch=(any) license=('BSD') -makedepends=('python-setuptools' 'python2-setuptools' 'ipython' 'ipython2') +_deppy2=( + 'python2>=2.7' + 'python2<2.8' +) +_deppy=( + 'python>=3.7' + 'python<3.8' +) +_depends=( + 'ipython' +) +_makedepends=( + 'python-setuptools' +) +makedepends=( + "${_deppy[@]}" + "${_deppy2[@]}" + "${_makedepends[@]}" + "${_makedepends[@]/python/python2}" + "${_depends[@]}" + "${_depends[@]/python/python2}" +) source=("https://github.com/ipython/ipyparallel/archive/${pkgver}.tar.gz") sha512sums=('abfbfdc23999a442fb9a1cc1c04c71dbf456cb78af9133b7a5510819f55e645e0dc6ae9b0894c4d04a18591988c6ede8c2400cca6d11167797c7b41861f70d04') @@ -36,7 +57,11 @@ _package_ipython-ipyparallel() { } package_ipython-ipyparallel() { - depends=('ipython' 'ipython-ipyparallel-common') + depends=( + "${_deppy[@]}" + "${_depends[@]}" + 'ipython-ipyparallel-common' + ) _package_ipython-ipyparallel for f in "${_common_files[@]}"; do @@ -54,7 +79,11 @@ _package_ipython2-ipyparallel() { } package_ipython2-ipyparallel() { - depends=('ipython2' 'ipython-ipyparallel-common') + depends=( + "${_deppy2[@]}" + "${_depends[@]/python/python2}" + 'ipython-ipyparallel-common' + ) _package_ipython2-ipyparallel for f in "${_common_files[@]}"; do diff --git a/jupyterhub/PKGBUILD b/jupyterhub/PKGBUILD index 3f14c986..39199607 100644 --- a/jupyterhub/PKGBUILD +++ b/jupyterhub/PKGBUILD @@ -2,14 +2,14 @@ pkgname=jupyterhub pkgver=0.9.1 -pkgrel=1 +pkgrel='2' pkgdesc="Multi-user server for Jupyter notebooks " url="http://jupyter.org/" arch=(any) license=('BSD') depends=( - 'python>=3.6' - 'python<3.7' + 'python>=3.7' + 'python<3.8' 'python-alembic' 'python-async_generator>=1.8' 'python-traitlets>=4.3.2' diff --git a/pssh-git/PKGBUILD b/pssh-git/PKGBUILD index a17816bd..470529eb 100644 --- a/pssh-git/PKGBUILD +++ b/pssh-git/PKGBUILD @@ -5,12 +5,16 @@ pkgname=pssh-git pkgver=2.3.1+27+ga2f936b _commit="${pkgver##*+}" -pkgrel=1 +pkgrel='2' pkgdesc="Parallel versions of the openssh tools ssh, scp, rsync, nuke, slurp" arch=('any') url="http://code.google.com/p/parallel-ssh/" license=('BSD') -depends=('openssh' 'python') +depends=( + 'python>=3.7' + 'python<3.8' + 'openssh' +) makedepends=('git' 'python-setuptools') provides=('pssh') conflicts=('pssh') diff --git a/python-asteval/PKGBUILD b/python-asteval/PKGBUILD index 4d961213..b36eb55c 100644 --- a/python-asteval/PKGBUILD +++ b/python-asteval/PKGBUILD @@ -4,15 +4,25 @@ pkgbase=python-asteval pkgname=('python-asteval' 'python2-asteval') pkgver=0.9.12 -pkgrel=1 +pkgrel='2' pkgdesc='Minimal Python AST Evaluator' arch=('any') url='https://newville.github.io/asteval/' license=('MIT') +_deppy2=( + 'python2>=2.7' + 'python2<2.8' +) +_deppy=( + 'python>=3.7' + 'python<3.8' +) _depends=('python' 'python-numpy>=1.6' 'python-six') _makedepends=('python-setuptools') _checkdepends=('python-nose' 'python-pytest') makedepends=( + "${_deppy[@]}" + "${_deppy2[@]}" "${_depends[@]}" "${_depends[@]/python/python2}" "${_makedepends[@]}" "${_makedepends[@]/python/python2}" ) @@ -44,13 +54,19 @@ check() { } package_python-asteval(){ - depends=("${_depends[@]}") + depends=( + "${_deppy[@]}" + "${_depends[@]}" + ) cd "$srcdir/asteval-py-$pkgver" python setup.py install --root="$pkgdir/" --optimize=1 } package_python2-asteval(){ - depends=("${_depends[@]/python/python2}") + depends=( + "${_deppy2[@]}" + "${_depends[@]/python/python2}" + ) cd "$srcdir/asteval-py2-$pkgver" python2 setup.py install --root="$pkgdir/" --optimize=1 } diff --git a/python-fabio/PKGBUILD b/python-fabio/PKGBUILD index 80857eee..87feb9b0 100644 --- a/python-fabio/PKGBUILD +++ b/python-fabio/PKGBUILD @@ -5,11 +5,19 @@ pkgbase=python-fabio pkgname=(python2-fabio python-fabio) _pkgname=fabio pkgver=0.7.0 -pkgrel=1 +pkgrel='2' pkgdesc="I/O library for images produced by 2D X-ray detectors." arch=('i686' 'x86_64') url="http://www.silx.org" license=('MIT' 'LGPL' 'Apache') +_deppy2=( + 'python2>=2.7' + 'python2<2.8' +) +_deppy=( + 'python>=3.7' + 'python<3.8' +) _depends=( 'python-numpy' 'python-setuptools') @@ -20,6 +28,8 @@ source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/silx-kit/${_pkgname}/a sha512sums=('1ef84eb628f950d933db35335d2656c3385e07ede9bb833052661b8b6a5d39889889c9e58ddd3a5ccc3d3d0e7989c2b57942270142b6acca87d67ce7008a6fb4') makedepends=( + "${_deppy[@]}" + "${_deppy2[@]}" "${_depends[@]}" "${_depends[@]//python/python2}" "${_makedepends[@]}" @@ -41,6 +51,7 @@ build() { package_python2-fabio() { depends=( + "${_deppy2[@]}" "${_depends[@]//python/python2}" ) optdepends=( @@ -57,6 +68,7 @@ package_python2-fabio() { package_python-fabio() { depends=( + "${_deppy[@]}" "${_depends[@]}" ) optdepenends=( diff --git a/python-lmfit/PKGBUILD b/python-lmfit/PKGBUILD index b7265163..88e5790d 100644 --- a/python-lmfit/PKGBUILD +++ b/python-lmfit/PKGBUILD @@ -5,28 +5,44 @@ pkgbase=python-lmfit _pkgname=lmfit-py pkgname=('python-lmfit' 'python2-lmfit') pkgver=0.9.11 -pkgrel=1 +pkgrel='2' pkgdesc="Least-Squares Minimization with Constraints for Python" arch=('any') url="http://lmfit.github.io/lmfit-py/" license=('BSD') +_deppy2=( + 'python2>=2.7' + 'python2<2.8' +) +_deppy=( + 'python>=3.7' + 'python<3.8' +) _depends=( 'python-asteval>=0.9.12' 'python-numpy>=1.10' 'python-scipy>=0.17' 'python-six>1.10' - 'python-uncertainties>=3.0') + 'python-uncertainties>=3.0' +) _makedepends=( - 'python-setuptools') + 'python-setuptools' +) _checkdepends=( - 'python-nose') + 'python-nose' +) makedepends=( - "${_depends[@]}" "${_depends[@]/python/python2}" - "${_makedepends[@]}" "${_makedepends[@]/python/python2}" - ) + "${_deppy[@]}" + "${_deppy2[@]}" + "${_depends[@]}" + "${_depends[@]/python/python2}" + "${_makedepends[@]}" + "${_makedepends[@]/python/python2}" +) checkdepends=( - "${_checkdepends[@]}" "${_checkdepends[@]/python/python2}" - ) + "${_checkdepends[@]}" + "${_checkdepends[@]/python/python2}" +) source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/lmfit/lmfit-py/archive/${pkgver}.tar.gz") sha512sums=('e0fdbc0b969a53d94939b7d9821d0ef2f718d39481dcaabc2a24af239b5cf24bcb058579f7555854144757ea6f9ef7b458b71b64d8af5e1881037012aa774662') @@ -51,13 +67,19 @@ check() { } package_python-lmfit(){ - depends=("${_depends[@]}") + depends=( + "${_deppy[@]}" + "${_depends[@]}" + ) cd "$srcdir/lmfit-py-$pkgver" python setup.py install --root="$pkgdir/" --optimize=1 } package_python2-lmfit(){ - depends=("${_depends[@]/python/python2}") + depends=( + "${_deppy2[@]}" + "${_depends[@]/python/python2}" + ) cd "$srcdir/lmfit-py2-$pkgver" python2 setup.py install --root="$pkgdir/" --optimize=1 } diff --git a/python-oauth2/PKGBUILD b/python-oauth2/PKGBUILD index d47f0567..f631a810 100644 --- a/python-oauth2/PKGBUILD +++ b/python-oauth2/PKGBUILD @@ -3,11 +3,19 @@ pkgbase=python-oauth2 _pkgname=python-oauth2 pkgname=(python-oauth2 python2-oauth2) pkgver=1.1.0 -pkgrel=1 +pkgrel='2' pkgdesc='framework that aims at making it easy to provide authentication via OAuth 2.0 within an application stack/' url='https://github.com/wndhydrnt/python-oauth2/' arch=('any') license=('MIT') +_deppy2=( + 'python2>=2.7' + 'python2<2.8' +) +_deppy=( + 'python>=3.7' + 'python<3.8' +) _depends=( 'python-mock' 'python-mysql-connector' @@ -24,6 +32,8 @@ _optdepends=( 'python-redis' ) makedepends=( + "${_deppy[@]}" + "${_deppy2[@]}" "${_depends[@]}" "${_depends[@]/python/python2}" "${_makedepends[@]}" @@ -66,10 +76,8 @@ check() { } package_python-oauth2() { - _pyVer=$(python -V 2>&1 | cut -d' ' -f2 | cut -d. -f2) depends=( - "python>=3.${_pyVer}" - "python<3.$((_pyVer+1))" + "${_deppy[@]}" "${_depends[@]}" ) optdepends=("${_optdepends[@]}") @@ -80,10 +88,8 @@ package_python-oauth2() { } package_python2-oauth2() { - _pyVer=$(python2 -V 2>&1 | cut -d' ' -f2 | cut -d. -f2) depends=( - "python2>=2.${_pyVer}" - "python2<2.$((_pyVer+1))" + "${_deppy2[@]}" "${_depends[@]/python/python2}" ) optdepends=("${_optdepends[@]/python/python2}") diff --git a/python-pamela/PKGBUILD b/python-pamela/PKGBUILD index 0c1ac50e..91d77947 100644 --- a/python-pamela/PKGBUILD +++ b/python-pamela/PKGBUILD @@ -3,12 +3,16 @@ pkgname=python-pamela _pkgname=pamela pkgver=0.3.0 -pkgrel=2 +pkgrel='3' pkgdesc="Python PAM interface" arch=('any') url="https://github.com/minrk/pamela" license=('MIT') -depends=('pam' 'python>=3.6' 'python<3.7') +depends=( + 'python>=3.7' + 'python<3.8' + 'pam' +) source=("$_pkgname-$pkgver.tar.gz::https://github.com/minrk/$_pkgname/archive/${pkgver}.tar.gz") sha512sums=('61987d169dd10372bff974963c62416417b8b559325c8f2ecc9aca01fa1dd2c9e7992507ca10c623156c5f18640ec2ee07f9e654c998bea63d79c4b28b29cfc6') diff --git a/python-peakutils/PKGBUILD b/python-peakutils/PKGBUILD index bea7edce..30c602ff 100644 --- a/python-peakutils/PKGBUILD +++ b/python-peakutils/PKGBUILD @@ -4,16 +4,33 @@ pkgbase=python-peakutils pkgname=('python-peakutils' 'python2-peakutils') pkgver=1.1.1 -pkgrel=1 +pkgrel='2' pkgdesc="Peak detection utilities for 1D data" arch=('any') url="https://pypi.python.org/pypi/PeakUtils" license=('MIT') -_depends=('python-numpy' 'python-scipy') -_makedepends=('python-setuptools') +_deppy2=( + 'python2>=2.7' + 'python2<2.8' +) +_deppy=( + 'python>=3.7' + 'python<3.8' +) +_depends=( + 'python-numpy' + 'python-scipy' +) +_makedepends=( + 'python-setuptools' +) makedepends=( - "${_depends[@]}" "${_depends[@]/python/python2}" - "${_makedepends[@]}" "${_makedepends[@]/python/python2}" + "${_deppy[@]}" + "${_deppy2[@]}" + "${_depends[@]}" + "${_depends[@]/python/python2}" + "${_makedepends[@]}" + "${_makedepends[@]/python/python2}" ) source=("https://pypi.python.org/packages/cf/a0/9e9c716221b541c8b919a5c36f098ef5a34329ea881ff44ff581b427a36a/PeakUtils-${pkgver}.tar.gz") md5sums=('edd12f75854195a7d955bc3276bca2b5') @@ -35,6 +52,7 @@ build() { package_python-peakutils() { depends=( + "${_deppy[@]}" "${_depends[@]}" ) @@ -44,6 +62,7 @@ package_python-peakutils() { package_python2-peakutils() { depends=( + "${_deppy2[@]}" "${_depends[@]/python/python2}" ) diff --git a/python-postpic/PKGBUILD b/python-postpic/PKGBUILD index 6f7572d7..f9906966 100644 --- a/python-postpic/PKGBUILD +++ b/python-postpic/PKGBUILD @@ -3,22 +3,38 @@ pkgbase=python-postpic pkgname=(python-postpic python2-postpic) pkgver=0.3.1 -pkgrel=1 +pkgrel='2' pkgdesc='The open source particle-in-cell post processor.' url='https://github.com/skuschel/postpic' arch=('i686' 'x86_64') license=('GPL3') +_deppy2=( + 'python2>=2.7' + 'python2<2.8' +) +_deppy=( + 'python>=3.7' + 'python<3.8' +) _depends=( 'python-matplotlib' 'python-numpy>=1.7' 'python-scipy' 'python-future' 'python-urllib3' 'python-numexpr' ) +_makedepends=( + 'python-setuptools' + 'cython' + 'python-h5py' +) _optdepends=( 'python-h5py: h5 reader for openPMD support' 'python-sdf: sdf support for EPOCH reader' ) makedepends=( - 'python' 'python2' 'python-setuptools' 'python2-setuptools' 'cython' 'cython2' 'python-h5py' + "${_deppy[@]}" + "${_deppy2[@]}" "${_depends[@]}" "${_depends[@]/python/python2}" + "${_makedepends[@]}" + "${_makedepends[@]/ython/ython2}" ) source=($pkgname-$pkgver.tar.gz::https://github.com/skuschel/postpic/archive/v$pkgver.tar.gz) sha512sums=('0b1e2d80c7c8944b81da7c4b389c5d8190e856857acc56cd6c50545e15f7819182c2843e40a3cad5456406ad2d442b851cb6df732579d8e752cd09bc45e9cc79') @@ -50,10 +66,8 @@ check() { } package_python-postpic() { - _pyVer=$(python -V 2>&1 | cut -d' ' -f2 | cut -d. -f2) depends=( - "python>=3.${_pyVer}" - "python<3.$((_pyVer+1))" + "${_deppy[@]}" "${_depends[@]}" ) optdepends=("${_optdepends[@]}") @@ -65,10 +79,8 @@ package_python-postpic() { } package_python2-postpic() { - _pyVer=$(python2 -V 2>&1 | cut -d' ' -f2 | cut -d. -f2) depends=( - "python2>=2.${_pyVer}" - "python2<2.$((_pyVer+1))" + "${_deppy2[@]}" "${_depends[@]}" "${_depends[@]/python/python2}" ) diff --git a/python-pyfai/PKGBUILD b/python-pyfai/PKGBUILD index 7b321fd2..69b9efe2 100644 --- a/python-pyfai/PKGBUILD +++ b/python-pyfai/PKGBUILD @@ -5,11 +5,19 @@ pkgbase=python-pyfai pkgname=(python2-pyfai python-pyfai) _pkgname=pyFAI pkgver=0.15.0 -pkgrel=1 +pkgrel='2' pkgdesc="Fast Azimuthal Integration in Python." arch=('i686' 'x86_64') url="http://www.silx.org" license=('GPLv3' 'BSD' 'MIT') +_deppy2=( + 'python2>=2.7' + 'python2<2.8' +) +_deppy=( + 'python>=3.7' + 'python<3.8' +) _depends=('python-numpy' 'python-scipy' 'python-matplotlib' 'python-fabio' 'python-h5py' 'python-pyopencl' 'python-pyqt5' 'fftw' 'opencl-driver') _makedepends=('cython') @@ -18,6 +26,8 @@ source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/silx-kit/${_pkgname}/a sha256sums=('d72ae3b81ee4350e3768fd9ddc7a03ede4e33dbccddcba449cf1d563757c4726') makedepends=( + "${_deppy[@]}" + "${_deppy2[@]}" "${_depends[@]}" "${_depends[@]//python/python2}" "${_makedepends[@]}" @@ -39,6 +49,7 @@ build() { package_python2-pyfai() { depends=( + "${_deppy2[@]}" "${_depends[@]//python/python2}" ) optdepends=( @@ -57,6 +68,7 @@ package_python2-pyfai() { package_python-pyfai() { depends=( + "${_deppy[@]}" "${_depends[@]}" ) optdepends=( diff --git a/python-pyfftw/PKGBUILD b/python-pyfftw/PKGBUILD index 82b15b2e..7ae39b59 100644 --- a/python-pyfftw/PKGBUILD +++ b/python-pyfftw/PKGBUILD @@ -5,12 +5,33 @@ _pyname=pyFFTW pkgname=("python-pyfftw" "python2-pyfftw") pkgbase="python-pyfftw" pkgver=0.10.4 -pkgrel=1 +pkgrel='2' pkgdesc='A pythonic wrapper around FFTW.' url='http://hgomersall.github.io/pyFFTW/' -depends=('fftw') -_depends=('python-numpy' 'python-scipy') -makedepends=('python-setuptools' 'python2-setuptools' "${_depends[@]}" "${_depends[@]/python-/python2-}") +_deppy2=( + 'python2>=2.7' + 'python2<2.8' +) +_deppy=( + 'python>=3.7' + 'python<3.8' +) +_depends=( + 'python-numpy' + 'python-scipy' + 'fftw' +) +_makedepends=( + 'python-setuptools' +) +makedepends=( + "${_deppy[@]}" + "${_deppy2[@]}" + "${_depends[@]}" + "${_depends[@]/python-/python2-}" + "${_makedepends[@]}" + "${_makedepends[@]/python-/python2-}" +) license=('BSD') arch=('i686' 'x86_64') source=("https://pypi.python.org/packages/c2/2e/b25edc6960fc837e915eb1b38e5f0e3013e32e90aff14a1d0f4556b3d145/pyFFTW-${pkgver}.tar.gz") @@ -23,14 +44,20 @@ build() { } package_python-pyfftw() { - depends+=("${_depends[@]}") + depends=( + "${_deppy[@]}" + "${_depends[@]}" + ) cd $srcdir/$_pyname-$pkgver python setup.py install --root="$pkgdir" --optimize=1 install -D -m644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } package_python2-pyfftw() { - depends+=("${_depends[@]/python-/python2-}") + depends=( + "${_deppy2[@]}" + "${_depends[@]/python-/python2-}" + ) cd $srcdir/$_pyname-$pkgver python2 setup.py install --root="$pkgdir" --optimize=1 install -D -m644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" diff --git a/python-pywavelets/PKGBUILD b/python-pywavelets/PKGBUILD index c91a5fe9..a6aa4843 100644 --- a/python-pywavelets/PKGBUILD +++ b/python-pywavelets/PKGBUILD @@ -5,11 +5,19 @@ pkgbase=python-pywavelets pkgname=(python-pywavelets python2-pywavelets) _pkgname=pywt pkgver=0.5.2 -pkgrel=1 +pkgrel='2' pkgdesc="Discrete Wavelet Transforms in Python" arch=('x86_64' 'i686') url="https://github.com/PyWavelets/pywt" license=('MIT') +_deppy2=( + 'python2>=2.7' + 'python2<2.8' +) +_deppy=( + 'python>=3.7' + 'python<3.8' +) _depends=( 'cython>=0.20.2' 'python-nose' @@ -22,6 +30,8 @@ source=("$_pkgname-$pkgver.tar.gz::https://github.com/PyWavelets/pywt/archive/v$ sha512sums=('8efc27eaf38f602c7e71b2c85033ab895f1603b2e436280f660f60b86ff4763d6d8f8f420ad6c42e5fc86f966d799f70bc1660579f9bfd881af217e8ab66a54c') makedepends=( + "${_deppy[@]}" + "${_deppy2[@]}" "${_makedepends[@]}" "${_makedepends[@]/ython/ython2}" "${_depends[@]}" @@ -49,14 +59,20 @@ build() { } package_python2-pywavelets(){ - depends=("${_depends[@]/python/python2}") + depends=( + "${_deppy2[@]}" + "${_depends[@]/python/python2}" + ) cd "$srcdir/$_pkgname-$pkgver-py2" python2 setup.py install --root="$pkgdir/" --optimize=1 install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } package_python-pywavelets(){ - depends=("${_depends[@]}") + depends=( + "${_deppy[@]}" + "${_depends[@]}" + ) cd "$srcdir/$_pkgname-$pkgver" python setup.py install --root="$pkgdir/" --optimize=1 install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" diff --git a/python-scikit-image/PKGBUILD b/python-scikit-image/PKGBUILD index 4fc6473f..9688ebfd 100644 --- a/python-scikit-image/PKGBUILD +++ b/python-scikit-image/PKGBUILD @@ -5,14 +5,38 @@ pkgbase=python-scikit-image pkgname=('python2-scikit-image' 'python-scikit-image') pkgver=0.14.0 -pkgrel=1 +pkgrel='2' pkgdesc="Image processing routines for SciPy" arch=('i686' 'x86_64') url="http://scikit-image.org/" license=('BSD') +_deppy2=( + 'python2>=2.7' + 'python2<2.8' +) +_deppy=( + 'python>=3.7' + 'python<3.8' +) _depends=('python-scipy' 'python-matplotlib' 'python-networkx' 'python-pillow' 'python-pywavelets') -makedepends=('cython2' 'cython' 'python2-six' 'python-six' "${_depends[@]}" "${_depends[@]/python-/python2-}") +_makedepends=( + 'cython' + 'python-six' +) +_optdepends=( + 'python-pyqt4: for imshow(x, fancy=True) and skivi' + 'freeimage: for reading various types of image file formats' + 'python-pyamg: fast cg_mg mode of random walker segmentation' +) +makedepends=( + "${_deppy[@]}" + "${_deppy2[@]}" + "${_depends[@]}" + "${_depends[@]/python-/python2-}" + "${_makedepends[@]}" + "${_makedepends[@]/python-/python2-}" +) options=('!emptydirs') source=(https://pypi.python.org/packages/fc/20/d3e736493b16e9455ce8579722d644b313814c599d5824d34e448845f746/scikit-image-${pkgver}.tar.gz) sha512sums=('224a6af745e1eb7d38c425afa411a9baac3e9504b639233fd10300a55006c3babdf40a3e7ee124e81b327c9f06d0baf35d3f2ccf8f69d3d2d6a54be0e40132f9') @@ -39,9 +63,13 @@ build() { } package_python2-scikit-image() { - depends=("${_depends[@]/python-/python2-}") - optdepends=('python2-pyqt4: for imshow(x, fancy=True) and skivi' - 'freeimage: for reading various types of image file formats') + depends=( + "${_deppy2[@]}" + "${_depends[@]/python-/python2-}" + ) + optdepends=( + "${_optdepends[@]/python-/python2-}" + ) cd "${srcdir}"/scikit-image-py2-$pkgver python2 setup.py install --root="${pkgdir}"/ --optimize=1 @@ -50,10 +78,13 @@ package_python2-scikit-image() { } package_python-scikit-image() { - depends=("${_depends[@]}") - optdepends=('python-pyqt4: for imshow(x, fancy=True) and skivi' - 'freeimage: for reading various types of image file formats' - 'python-pyamg: fast cg_mg mode of random walker segmentation') + depends=( + "${_deppy2[@]}" + "${_depends[@]}" + ) + optdepends=( + "${_optdepends[@]}" + ) cd "${srcdir}"/scikit-image-$pkgver python setup.py install --root="${pkgdir}"/ --optimize=1 diff --git a/python-silx/PKGBUILD b/python-silx/PKGBUILD index 71605cf7..99241e7d 100644 --- a/python-silx/PKGBUILD +++ b/python-silx/PKGBUILD @@ -5,11 +5,19 @@ pkgbase=python-silx pkgname=(python2-silx python-silx) _pkgname=silx pkgver=0.8.0 -pkgrel=1 +pkgrel='2' pkgdesc="A collection of Python packages for data analysis at synchrotron radiation facilities." arch=('i686' 'x86_64') url="http://www.silx.org" license=('MIT' 'LGPL') +_deppy2=( + 'python2>=2.7' + 'python2<2.8' +) +_deppy=( + 'python>=3.7' + 'python<3.8' +) _depends=('python-numpy' 'python-pyqt5' 'python-matplotlib') _optdepends=('python-h5py: for HDF5 input/output' 'ipython: for interactive console' @@ -21,6 +29,8 @@ source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/silx-kit/${_pkgname}/a sha256sums=('991250e242d4be6b5e6eae4d9267b5ba1e70d3abdd2aa4244bd55ce0fe4d0a49') makedepends=( + "${_deppy[@]}" + "${_deppy2[@]}" "${_depends[@]}" "${_depends[@]//python/python2}" "${_makedepends[@]}" @@ -42,6 +52,7 @@ build() { package_python2-silx() { depends=( + "${_deppy2[@]}" "${_depends[@]//python/python2}" ) optdepends=( @@ -59,6 +70,7 @@ package_python2-silx() { package_python-silx() { depends=( + "${_deppy[@]}" "${_depends[@]}" ) optdepenends=( diff --git a/python-simplepam/PKGBUILD b/python-simplepam/PKGBUILD index d1c0cf90..3208198d 100644 --- a/python-simplepam/PKGBUILD +++ b/python-simplepam/PKGBUILD @@ -3,12 +3,16 @@ pkgname=python-simplepam _pkgname=python3-simplepam pkgver=0.1.5 -pkgrel=2 +pkgrel='3' pkgdesc="Pure Python interface to the Pluggable Authentication Modules system on Linux" arch=('any') url="https://github.com/leonnnn/python3-simplepam" license=('MIT') -depends=('pam' 'python>=3.6' 'python<3.7') +depends=( + 'python>=3.7' + 'python<3.8' + 'pam' +) source=("$_pkgname-$pkgver.tar.gz::https://github.com/leonnnn/python3-simplepam/archive/$pkgver.tar.gz") sha512sums=('031fd8cb705d860fd1f370bd2a3cc788d1ec4a6a91cc25b548f0b11a5294dc2f57f246279e4503aaafc978f4e45df2d332bef5143c70bf4cf58d9445801b30df') diff --git a/python-sphinxcontrib-programoutput/PKGBUILD b/python-sphinxcontrib-programoutput/PKGBUILD index 64c6155b..6081fa92 100644 --- a/python-sphinxcontrib-programoutput/PKGBUILD +++ b/python-sphinxcontrib-programoutput/PKGBUILD @@ -5,11 +5,19 @@ pkgbase=python-sphinxcontrib-programoutput pkgname=(python2-sphinxcontrib-programoutput python-sphinxcontrib-programoutput) _pkgname=sphinxcontrib-programoutput pkgver=0.11 -pkgrel=1 +pkgrel='2' pkgdesc="Sphinx extension to include program output" arch=('any') url="https://bitbucket.org/birkenfeld/sphinx-contrib" license=('BSD') +_deppy2=( + 'python2>=2.7' + 'python2<2.8' +) +_deppy=( + 'python>=3.7' + 'python<3.8' +) _depends=( 'python') _makedepends=( @@ -22,10 +30,12 @@ source=( source=(https://pypi.python.org/packages/25/34/fd1b61d3fe9ea705dff169d55426bf23d8be0f7b1976d17e79fbcc16e7d9/${_pkgname}-${pkgver}.tar.gz) sha512sums=('4aa655f8632093035de986fa31291f95e95c4c0f4d1458bb8c8cc077cca73d579b16a8bf103d7b34faafb2171c617c40200008d89186f8ed37a812459f0376cf') makedepends=( - ${_makedepends[@]} - ${_makedepends[@]/python/python2} - ${_depends[@]} - ${_depends[@]/python/python2} + "${_deppy[@]}" + "${_deppy2[@]}" + "${_makedepends[@]}" + "${_makedepends[@]/python/python2}" + "${_depends[@]}" + "${_depends[@]/python/python2}" ) prepare() { @@ -43,7 +53,8 @@ build() { package_python2-sphinxcontrib-programoutput() { depends=( - ${_depends[@]/python/python2} + "${_deppy2[@]}" + "${_depends[@]/python/python2}" ) cd "${srcdir}/py2-${_pkgname}-${pkgver}" @@ -54,7 +65,8 @@ package_python2-sphinxcontrib-programoutput() { package_python-sphinxcontrib-programoutput() { depends=( - ${_depends[@]} + "${_deppy2[@]}" + "${_depends[@]}" ) cd "${srcdir}/py-${_pkgname}-${pkgver}" diff --git a/python2-wxmplot/PKGBUILD b/python2-wxmplot/PKGBUILD index a65ffae0..08d0e145 100755 --- a/python2-wxmplot/PKGBUILD +++ b/python2-wxmplot/PKGBUILD @@ -8,7 +8,8 @@ url='https://pypi.python.org/pypi/wxmplot/0.9.18' license=('OSI Approved :: MIT License') groups=() depends=( - 'python2' + 'python2>=2.7' + 'python2<2.8' 'wxpython' 'python2-matplotlib' ) diff --git a/python2-wxutils/PKGBUILD b/python2-wxutils/PKGBUILD index 2e60d42d..ec7c8060 100755 --- a/python2-wxutils/PKGBUILD +++ b/python2-wxutils/PKGBUILD @@ -8,7 +8,8 @@ url='https://pypi.python.org/pypi/wxutils/0.1.2' license=('BSD') groups=() depends=( - 'python2' + 'python2>=2.7' + 'python2<2.8' 'wxpython' ) makedepends=( diff --git a/xraylarch/PKGBUILD b/xraylarch/PKGBUILD index 9eefa3af..d1c1d567 100755 --- a/xraylarch/PKGBUILD +++ b/xraylarch/PKGBUILD @@ -8,7 +8,8 @@ url="http://xraypy.github.io/xraylarch/" license=('BSD') groups=() depends=( - 'python2' + 'python2>=2.7' + 'python2<2.8' 'python2-asteval>=0.9.12' 'python2-backports.functools_lru_cache' # 'python2-epics>=3.2.4' -- cgit v1.2.3-54-g00ecf