[arch-commits] Commit in python-h5py-openmpi/trunk (PKGBUILD)

[Bruno Pagani]

    Date: Monday, February 17, 2020 @ 17:51:57
  Author: archange
Revision: 574477

Drop python2 version

Modified:
  python-h5py-openmpi/trunk/PKGBUILD

----------+
 PKGBUILD |   35 ++++++-----------------------------
 1 file changed, 6 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-02-17 17:51:22 UTC (rev 574476)
+++ PKGBUILD	2020-02-17 17:51:57 UTC (rev 574477)
@@ -11,10 +11,11 @@
 arch=(x86_64)
 url="https://www.h5py.org/"
 license=(BSD)
-depends=(hdf5-${_mpi})
-makedepends=(cython cython2 python-numpy python2-numpy python-six python2-six
-             python-pkgconfig python2-pkgconfig python-mpi4py python2-mpi4py)
-checkdepends=(inetutils python-pytest python2-pytest python2-unittest2)
+depends=(hdf5-${_mpi} python-numpy python-six python-mpi4py)
+makedepends=(cython python-pkgconfig)
+checkdepends=(inetutils python-pytest)
+conflicts=(python-h5py)
+provides=(python-h5py)
 source=(https://files.pythonhosted.org/packages/source/h/${_pkg}/${_pkg}-${pkgver}.tar.gz)
 sha256sums=('84412798925dc870ffd7107f045d7659e60f5d46d1c70c700375248bf6bf512d')
 validpgpkeys=(AC47F71DB275ECD0B3DA46E857FA4540DD4EFCF7 # Thomas A Caswell (Brookhaven National Lab) <tcaswell at bnl.gov>
@@ -24,7 +25,6 @@
 prepare() {
   # Remove RPATH
   sed -i "s/settings\\['runtime_library_dirs'\\] = settings\\['library_dirs'\\]/pass/" ${_pkg}-${pkgver}/setup_build.py
-  cp -a ${_pkg}-${pkgver}{,-py2}
 }
 
 build() {
@@ -32,39 +32,16 @@
   cd ${_pkg}-${pkgver}
   python setup.py configure --mpi 
   python setup.py build
-
-  cd ../${_pkg}-${pkgver}-py2
-  python2 setup.py configure --mpi
-  python2 setup.py build
 }
 
 check() {
   cd ${_pkg}-${pkgver}
   python setup.py test
-
-  cd ../${_pkg}-${pkgver}-py2
-  # https://github.com/h5py/h5py/issues/1435
-  python2 setup.py test || warning "Tests failed"
 }
 
-package_python-h5py-openmpi() {
-  depends+=(python-numpy python-six python-mpi4py)
-  conflicts=(python-h5py)
-  provides=(python-h5py)
-
+package() {
   cd ${_pkg}-${pkgver}
   python setup.py install --root="${pkgdir}" --skip-build --optimize=1
 
   install -Dm644 licenses/license.txt -t "${pkgdir}"/usr/share/licenses/${pkgname}/
 }
-
-package_python2-h5py-openmpi() {
-  depends+=(python2-numpy python2-six python2-mpi4py)
-  conflicts=(python2-h5py)
-  provides=(python2-h5py)
-
-  cd ${_pkg}-${pkgver}-py2
-  python2 setup.py install --root="${pkgdir}" --skip-build --optimize=1
-
-  install -Dm644 licenses/license.txt -t "${pkgdir}"/usr/share/licenses/${pkgname}/
-}