summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-x.SRCINFO68
-rw-r--r--PKGBUILD105
2 files changed, 56 insertions, 117 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a53b2ed3da31..09ca86ba8bd9 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,64 +1,26 @@
pkgbase = python-galsim-git
- pkgdesc = The modular galaxy image simulation toolkit
- pkgver = v2.2.3.r1.8f0b20826
+ pkgdesc = Modular galaxy image simulation toolkit
+ pkgver = 2.3.5.r0.g96c80bde3
pkgrel = 1
- url = https://github.com/GalSim-developers/GalSim.git
- arch = i686
+ url = https://github.com/GalSim-developers/GalSim
arch = x86_64
license = BSD
- checkdepends = python-nose
- checkdepends = python2-nose
- checkdepends = python-yaml
- checkdepends = python2-yaml
- checkdepends = python-pandas
- checkdepends = python2-pandas
makedepends = git
- makedepends = scons
- makedepends = boost-libs
- makedepends = fftw
- makedepends = tmv-git
- makedepends = eigen
- makedepends = pybind11
- makedepends = python-coord-git
- makedepends = python2-coord-git
+ makedepends = python-build
+ makedepends = python-installer
makedepends = python-setuptools
- makedepends = python2-setuptools
- makedepends = python2-astropy
- makedepends = python2-future
- makedepends = python2-numpy
- makedepends = python-astropy
- makedepends = python-future
- makedepends = python-numpy
- source = python-galsim-git::git+https://github.com/GalSim-developers/GalSim.git
- md5sums = SKIP
-
-pkgname = python-galsim-git
- depends = pybind11
- depends = python-astropy
- depends = python-numpy
- depends = python-future
- depends = galsim-common-git
+ makedepends = python-wheel
depends = boost-libs
- depends = fftw
- depends = tmv-git
depends = eigen
- depends = pybind11
- depends = python-coord-git
-
-pkgname = python2-galsim-git
- depends = pybind11
- depends = python2-astropy
- depends = python2-numpy
- depends = python2-future
- depends = galsim-common-git
- depends = boost-libs
depends = fftw
- depends = tmv-git
- depends = eigen
depends = pybind11
- depends = python2-coord-git
-
-pkgname = galsim-common-git
- pkgdesc = common files for python-galsim and python2-galsim
- depends = fftw
+ depends = python-astropy
+ depends = python-coord
+ depends = python-future
+ depends = python-numpy
+ provides = python-galsim=2.3.5
+ conflicts = python-galsim
+ source = python-galsim::git+https://github.com/GalSim-developers/GalSim
+ sha256sums = SKIP
+pkgname = python-galsim-git
diff --git a/PKGBUILD b/PKGBUILD
index 28ef2bbef33d..4998f16a179b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,75 +1,52 @@
-# 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-git
-pkgname=('python-galsim-git' 'python2-galsim-git' 'galsim-common-git')
-pkgver=v2.2.3.r1.8f0b20826
+
+pkgname=python-galsim-git
+_pkgname="${pkgname%-git}"
+_pkg=GalSim
+pkgver=2.3.5.r0.g96c80bde3
+_pkgver="${pkgver%.r*}"
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")
-source=("${pkgbase}::git+${url}")
-md5sums=('SKIP')
+depends=(
+ 'boost-libs'
+ 'eigen'
+ 'fftw'
+ 'pybind11'
+ 'python-astropy'
+ 'python-coord'
+ 'python-future'
+ 'python-numpy')
+makedepends=('git' 'python-build' 'python-installer' 'python-setuptools' 'python-wheel')
+# checkdepends=('python-nose' 'python-pandas' 'python-yaml')
+provides=("$_pkgname=$_pkgver")
+conflicts=("$_pkgname")
+source=("$_pkgname::git+$url")
+sha256sums=('SKIP')
pkgver() {
- cd "${pkgbase}"
- printf "%s" "$(git describe --long | sed 's/\([^-]*-\)g/r\1/;s/-/./g')"
-}
-
-prepare() {
- cp -a $pkgbase{,-py2}
+ git -C "$_pkgname" describe --long --tags | sed 's/^v//;s/-/.r/;s/-/./'
}
-
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-git() {
- depends=('pybind11' 'python-astropy' 'python-numpy' 'python-future' 'galsim-common-git' '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 "$_pkgname"
+ python -m build --wheel --no-isolation
}
-package_python2-galsim-git() {
- depends=('pybind11' 'python2-astropy' 'python2-numpy' 'python2-future' 'galsim-common-git' '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 "$_pkgname"
+# local _py="$(python -c 'import sys; print(".".join(map(str, sys.version_info[:2])))')"
+# PYTHONPATH="$PWD/build/lib.linux-$CARCH-$_py" nosetests
+# }
+
+package() {
+ cd "$_pkgname"
+ 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-git() {
- 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
-}
-
-