update to 2.3.5

1 files changed, 36 insertions, 66 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 31c723643b61..b24a9859a753 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,74 +1,44 @@
-# Maintainer: Andres Alejandro Navarro Alsina <aanavarroa@unal.edu.co>
+# Maintainer: Luis Martinez <luis dot martinez at disroot dot org>
+# Contributor: Andres Alejandro Navarro Alsina <aanavarroa@unal.edu.co>
 # Contributor:  GalSim developers team on GitHub
-pkgbase=python-galsim
-pkgname=('python-galsim' 'python2-galsim' 'galsim-common')
-pkgver=v2.1.4.r0.2e459f5a8
+
+pkgname=python-galsim
+_pkg=GalSim
+pkgver=2.3.5
 pkgrel=1
-pkgdesc=" The modular galaxy image simulation toolkit "
-arch=('i686' 'x86_64')
-url="https://github.com/GalSim-developers/GalSim.git"
+pkgdesc="Modular galaxy image simulation toolkit"
+arch=('x86_64')
+url="https://github.com/GalSim-developers/GalSim"
 license=('BSD')
-makedepends=('git' 'scons' 'boost-libs' 'fftw' 'tmv-git' 'eigen' 'pybind11' 'python-coord-git' 'python2-coord-git' 'python-setuptools' 'python2-setuptools' 'python2-astropy' 'python2-future' 'python2-numpy' 'python-astropy' 'python-future' 'python-numpy')
-checkdepends=('python-nose' 'python2-nose' 'python-yaml' 'python2-yaml' 'python-pandas' 'python2-pandas')
-source=("${pkgbase}::git+${url}#tag=v2.1.4")
-md5sums=('SKIP')
-
-pkgver() {
-	 cd "${pkgbase}"
-	 printf "%s" "$(git describe --long | sed 's/\([^-]*-\)g/r\1/;s/-/./g')"
-}
-
-prepare() {
-	  cp -a $pkgbase{,-py2}
-}
-
+depends=(
+	'boost-libs'
+	'eigen'
+	'fftw'
+	'pybind11'
+	'python-astropy'
+	'python-coord'
+	'python-future'
+	'python-numpy')
+makedepends=('python-build' 'python-installer' 'python-setuptools' 'python-wheel')
+# checkdepends=('python-nose' 'python-yaml' 'python-pandas')
+source=("$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/G/$_pkg/$_pkg-$pkgver.tar.gz")
+sha256sums=('369d86d86919eca95c3bafdca37415e3db98abb1066f5f909efb2a04bf043ae5')
 
 build() {
-	cd "$srcdir"/$pkgbase
-	scons PREFIX=/usr TMV_DIR=/usr PYBIND11_DIR=/usr/include EIGEN_DIR=/usr/include/eigen3 PYTHON=python
-
-	cd  "$srcdir"/$pkgbase-py2
-	scons PREFIX=/usr TMV_DIR=/usr PYBIND11_DIR=/usr/include EIGEN_DIR=/usr/include/eigen3 PYTHON=python2
-}
-
-check() {
-	cd "$srcdir"/$pkgbase/tests
-	nosetests -v || warning 'Tests failed'
-
-	cd "$srcdir"/$pkgbase-py2/tests
-	nosetests2 -v || warning 'Tests2 failed'
-}
-
-	
-package_python-galsim() {
-			    depends=('pybind11' 'python-astropy' 'python-numpy' 'python-future' 'galsim-common' 'boost-libs' 'fftw' 'tmv-git' 'eigen' 'pybind11' 'python-coord-git')
-			    cd $pkgbase
-			    scons PREFIX="${pkgdir}"/usr  FINAL_PREFIX=/usr  PYTHON=python install
-			    rm -rf "${pkgdir}"/usr/share
-			    rm -f "${pkgdir}"/usr/lib/libgalsim.so
-			    rm -f "${pkgdir}"/usr/lib/libgalsim.so.2.1
-			    install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE
+	cd "$_pkg-$pkgver"
+	python -m build --wheel --no-isolation
 }
 
-package_python2-galsim() {
-			     depends=('pybind11' 'python2-astropy' 'python2-numpy' 'python2-future' 'galsim-common' 'boost-libs' 'fftw' 'tmv-git' 'eigen' 'pybind11' 'python2-coord-git')
-			     cd $pkgbase-py2
-			     scons PREFIX=$pkgdir/usr  FINAL_PREFIX=/usr PYTHON=python2 install
-			     rm -rf "${pkgdir}"/usr/share		 
-			     rm -f "${pkgdir}"/usr/lib/libgalsim.so	 
-			     rm -f "${pkgdir}"/usr/lib/libgalsim.so.2.1
-			     for i in galsim galsim_download_cosmos; do mv "$pkgdir"/usr/bin/${i}{,2}; done
-			     install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE
+# check() {
+# 	cd "$_pkg-$pkgver"
+# 	local _py="$(python -c 'import sys; print(".".join(map(str, sys.version_info[:2])))')"
+# 	PYTHONPATH="$PWD/build/lib.linux-$CARCH-$_py" nosetests
+# }
+
+package() {
+	cd "$_pkg-$pkgver"
+	PYTHONHASHSEED=0 python -m installer --destdir="$pkgdir" dist/*.whl
+	local _site="$(python -c 'import site; print(site.getsitepackages()[0])')"
+	install -d "$pkgdir/usr/share/licenses/$pkgname/"
+	ln -s "$_site/$_pkg-$pkgver.dist-info/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/"
 }
-
-package_galsim-common() {
-			    depends=('fftw')
- 			    pkgdesc='common files for python-galsim and python2-galsim'
-    			    cd $pkgbase
-			    install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE
-    			    mv "${srcdir}"/$pkgbase/share/ "${pkgdir}"/usr/share/galsim/
-  			    install -Dm644 "${srcdir}"/$pkgbase/lib/libgalsim.so "${pkgdir}"/usr/lib/libgalsim.so
-			    install -Dm644 "${srcdir}"/$pkgbase/lib/libgalsim.so.2.1 "${pkgdir}"/usr/lib/libgalsim.so.2.1
-}
-
-