update to 1.12.0

rewrote package according to Python packaging guidelines

3 files changed, 83 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f440d7332e38..2c7ae2b7fc7a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,20 @@
 pkgbase = python-pyfr
-	pkgdesc = Python based framework for solving advection-diffusion type problems on streaming architectures
-	pkgver = 1.9.0
+	pkgdesc = Framework for solving advection-diffusion type problems on streaming architectures
+	pkgver = 1.12.2
 	pkgrel = 1
-	url = http://www.pyfr.org/
-	arch = i686
+	url = https://github.com/pyfr/pyfr
 	arch = x86_64
 	license = BSD
+	makedepends = git
 	makedepends = python-setuptools
+	depends = python>=3.8
+	depends = python-appdirs>=1.4.0
 	depends = python-gimmik>=2.0
 	depends = python-h5py-openmpi>=2.6
-	depends = python-numpy>=1.8
+	depends = python-numpy>=1.20
 	depends = python-pytools>=2016.2.1
 	depends = python-mako>=1.0.0
-	depends = python-mpi4py>=2.0
+	depends = python-mpi4py>=3.0
 	optdepends = metis>=5.0: needed for running PyFR in parallel
 	optdepends = scotch>=6.0: needed for running PyFR in parallel
 	optdepends = python-pymic: needed for Xeon Phi MIC backend
@@ -23,8 +25,10 @@ pkgbase = python-pyfr
 	optdepends = cblas: needed for OpenMP backend
 	optdepends = openblas: alternative blas for OpenMP backend
 	optdepends = cgns>=3.3: for importing CGNS meshes
-	source = python-pyfr-1.9.0.tar.gz:https://github.com/PyFR/PyFR/archive/v1.9.0.tar.gz
-	sha256sums = a99d9dfbe3f8a9ba057e881b1b4d5dd7119235485d7a043381b93334bfb5ab66
+	source = python-pyfr::git+https://github.com/pyfr/pyfr#commit=fb710d27b9627a27d4b3946246548414a9d18e4a?signed
+	source = 001-remove-tests.patch
+	validpgpkeys = AEEA6F51A3521732B684C1049E70614148A0FA1F
+	sha256sums = SKIP
+	sha256sums = 97d817a571eed6f659b9970acf45edd3c9d12d8370d0fe3d998f10cec710b10b
 
 pkgname = python-pyfr
-
diff --git a/001-remove-tests.patch b/001-remove-tests.patch
new file mode 100644
index 000000000000..315f57c88412
--- /dev/null
+++ b/001-remove-tests.patch
@@ -0,0 +1,23 @@
+diff --git a/setup.py b/setup.py
+index ddb6746..a73592b 100755
+--- a/setup.py
++++ b/setup.py
+@@ -94,8 +94,7 @@ package_data = {
+     'pyfr.solvers.euler.kernels.bcs': ['*.mako'],
+     'pyfr.solvers.euler.kernels.rsolvers': ['*.mako'],
+     'pyfr.solvers.navstokes.kernels': ['*.mako'],
+-    'pyfr.solvers.navstokes.kernels.bcs': ['*.mako'],
+-    'pyfr.tests': ['*.npz']
++    'pyfr.solvers.navstokes.kernels.bcs': ['*.mako']
+ }
+ 
+ # Additional data
+@@ -150,7 +149,7 @@ setup(name='pyfr',
+       url='http://www.pyfr.org/',
+       license='BSD',
+       keywords='Math',
+-      packages=['pyfr'] + modules + tests,
++      packages=['pyfr'] + modules,
+       package_data=package_data,
+       data_files=data_files,
+       entry_points={'console_scripts': console_scripts},
diff --git a/PKGBUILD b/PKGBUILD
index fe8349f6a8a2..63442ee28fba 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,43 +1,58 @@
-# Maintainer: LinRs <LinRs@users.noreply.github.com>
+# Maintainer: Luis Martinez <luis dot martinez at disroot dot org>
+# Contributor: LinRs <LinRs@users.noreply.github.com>
 # Contributor: Masoud <mpoloton@gmail.com>
 
-pkgname=('python-pyfr')
-_pkgname=PyFR
-pkgver=1.9.0
+pkgname=python-pyfr
+pkgver=1.12.2
+_commit=fb710d27b9627a27d4b3946246548414a9d18e4a
 pkgrel=1
-pkgdesc="Python based framework for solving advection-diffusion type problems on streaming architectures"
-arch=('i686' 'x86_64')
-url="http://www.pyfr.org/"
+pkgdesc="Framework for solving advection-diffusion type problems on streaming architectures"
+arch=('x86_64')
+url='https://github.com/pyfr/pyfr'
 license=('BSD')
-makedepends=('python-setuptools')
-source=("$pkgname-$pkgver.tar.gz":"https://github.com/PyFR/PyFR/archive/v${pkgver}.tar.gz")
-depends=( 'python-gimmik>=2.0'
-	  'python-h5py-openmpi>=2.6'
-	  'python-numpy>=1.8'
-	  'python-pytools>=2016.2.1'
-	  'python-mako>=1.0.0'
-	  'python-mpi4py>=2.0')
-optdepends=('metis>=5.0: needed for running PyFR in parallel'
-	    'scotch>=6.0: needed for running PyFR in parallel'
-	    'python-pymic: needed for Xeon Phi MIC backend'
-	    'python-pycuda>=2015.1: needed for CUDA backend'
-	    'cuda>=4.2: needed for CUDA backend'
-	    'python-pyopencl: needed for OpenCL backend'
-	    'clblas: needed for OpenCL backend'
-	    'cblas: needed for OpenMP backend'
-	    'openblas: alternative blas for OpenMP backend'
-	    'cgns>=3.3: for importing CGNS meshes' )
+depends=(
+	'python>=3.8'
+	'python-appdirs>=1.4.0'
+	'python-gimmik>=2.0'
+	'python-h5py-openmpi>=2.6'
+	'python-numpy>=1.20'
+	'python-pytools>=2016.2.1'
+	'python-mako>=1.0.0'
+	'python-mpi4py>=3.0')
+optdepends=(
+	'metis>=5.0: needed for running PyFR in parallel'
+	'scotch>=6.0: needed for running PyFR in parallel'
+	'python-pymic: needed for Xeon Phi MIC backend'
+	'python-pycuda>=2015.1: needed for CUDA backend'
+	'cuda>=4.2: needed for CUDA backend'
+	'python-pyopencl: needed for OpenCL backend'
+	'clblas: needed for OpenCL backend'
+	'cblas: needed for OpenMP backend'
+	'openblas: alternative blas for OpenMP backend'
+	'cgns>=3.3: for importing CGNS meshes')
+makedepends=('git' 'python-setuptools')
+source=("$pkgname::git+$url#commit=$_commit?signed"
+        '001-remove-tests.patch')
+sha256sums=('SKIP'
+            '97d817a571eed6f659b9970acf45edd3c9d12d8370d0fe3d998f10cec710b10b')
+validpgpkeys=('AEEA6F51A3521732B684C1049E70614148A0FA1F')
 
-sha256sums=('a99d9dfbe3f8a9ba057e881b1b4d5dd7119235485d7a043381b93334bfb5ab66')
+PURGE_TARGETS=(usr/__main__.py)
+
+prepare() {
+	patch -p1 -d "$pkgname" < 001-remove-tests.patch
+}
 
 build() {
-  msg "Building pyfr"
-  cd "$srcdir"/${_pkgname}-${pkgver}
-  python setup.py build
+	cd "$pkgname"
+	python setup.py build
+	## FIXME: sphinxcontrib-contentui and sphinxcontrib-fancybox are not in the AUR
+	# cd doc
+	# make man
 }
 
 package() {
-  cd "$srcdir"/${_pkgname}-${pkgver}
-  python setup.py install --skip-build --root="$pkgdir" --optimize=1
-  install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+	cd "$pkgname"
+	python setup.py install --root="$pkgdir/" --optimize=1 --skip-build
+	install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }