diff options
| -rwxr-xr-x | .SRCINFO | 49 | ||||
| -rw-r--r--[-rwxr-xr-x] | PKGBUILD | 76 | ||||
| -rw-r--r-- | setup.py.patch | 26 |
3 files changed, 73 insertions, 78 deletions
@@ -1,41 +1,22 @@ pkgbase = python-ngmix-git - pkgdesc = Gaussian mixture models and other code for working with for 2d images, implemented in python - pkgver = v1.3.7.r14.97d96cb + pkgdesc = Gaussian mixtures and image processing + pkgver = 2.1.0.r5.g892fd4a pkgrel = 1 - url = https://github.com/esheldon/ngmix.git - arch = i686 - arch = x86_64 + url = https://github.com/esheldon/ngmix + arch = any license = GPL - checkdepends = python-nose - checkdepends = python2-nose - checkdepends = python2-galsim-git - checkdepends = python-galsim-git - checkdepends = python2-singledispatch makedepends = git - makedepends = python - makedepends = python2 - makedepends = python-numpy - makedepends = python2-numpy - makedepends = python-numba - makedepends = python2-numba - optdepends = python-scipy - optdepends = python2-scipy - optdepends = python-galsim-git - optdepends = python2-galsim-git - optdepends = python-scikit-learn - optdepends = python2-scikit-learn - optdepends = python-statsmodels - optdepends = python2-statsmodels - optdepends = python-emcee-git - optdepends = python2-emcee-git - source = python-ngmix::git+https://github.com/esheldon/ngmix.git - md5sums = SKIP - -pkgname = python-ngmix-git + makedepends = python-build + makedepends = python-installer + makedepends = python-setuptools + makedepends = python-wheel depends = python-numpy depends = python-numba + provides = python-ngmix=2.1.0 + conflicts = python-ngmix + source = python-ngmix::git+https://github.com/esheldon/ngmix + source = setup.py.patch + sha256sums = SKIP + sha256sums = 85057d5ec4f082a3599084dbe0e874be2af2a0f91786a10933b3368e6e025898 -pkgname = python2-ngmix-git - depends = python2-numpy - depends = python2-numba - +pkgname = python-ngmix-git diff --git a/PKGBUILD b/PKGBUILD index 118f050738bd..b8e166e3f6bc 100755..100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,59 +1,47 @@ -# 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: Erin Sheldon -_pkgname=python-ngmix -pkgbase=python-ngmix-git -pkgname=("python-ngmix-git" "python2-ngmix-git") -pkgver=v1.3.7.r14.97d96cb + +pkgname=python-ngmix-git +_pkg="${pkgname%-git}" +pkgver=2.1.0.r5.g892fd4a +_pkgver="${pkgver%.r*}" pkgrel=1 -pkgdesc=" Gaussian mixture models and other code for working with for 2d images, implemented in python " -arch=('i686' 'x86_64') -url="https://github.com/esheldon/ngmix.git" +pkgdesc='Gaussian mixtures and image processing' +arch=('any') +url="https://github.com/esheldon/ngmix" license=('GPL') -makedepends=('git' 'python' 'python2' 'python-numpy' 'python2-numpy' 'python-numba' 'python2-numba' ) -optdepends=('python-scipy' 'python2-scipy' 'python-galsim-git' 'python2-galsim-git' 'python-scikit-learn' 'python2-scikit-learn' 'python-statsmodels' 'python2-statsmodels' 'python-emcee-git' 'python2-emcee-git') -checkdepends=('python-nose' 'python2-nose' 'python2-galsim-git' 'python-galsim-git' 'python2-singledispatch') -source=("${_pkgname}::git+${url}") -md5sums=('SKIP') +depends=('python-numpy' 'python-numba') +makedepends=('git' 'python-build' 'python-installer' 'python-setuptools' 'python-wheel') +# checkdepends=('python-pytest' 'python-fitsio' 'python-galsim') +provides=("$_pkg=$_pkgver") +conflicts=("$_pkg") +source=("$_pkg::git+$url" + 'setup.py.patch') +sha256sums=('SKIP' + '85057d5ec4f082a3599084dbe0e874be2af2a0f91786a10933b3368e6e025898') pkgver() { - cd $_pkgname - printf "%s" "$(git describe --long | sed 's/\([^-]*-\)g/r\1/;s/-/./g')" + git -C "$_pkg" describe --long --tags | sed 's/^v//;s/-/.r/;s/-/./' } prepare() { - cp -a $_pkgname{,-py2} + patch -p1 -d "$_pkg" < setup.py.patch + sed -i "s/__version__/$_pkgver/" "$_pkg/setup.py" } build() { - cd "$srcdir"/$_pkgname - python setup.py build - - cd "$srcdir"/$_pkgname-py2 - python2 setup.py build -} - -check() { - cd "$srcdir"/$_pkgname - nosetests -v || warning 'Tests failed' - - cd "$srcdir"/$_pkgname-py2 - nosetests2 -v || warning 'Tests2 failed' - + cd "$_pkg" + python -m build --wheel --no-isolation } -package_python-ngmix-git() { - depends=('python-numpy' 'python-numba') - cd "${_pkgname}" - python setup.py install --root=${pkgdir} --prefix=/usr --optimize=1 - install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE +## conflicting dependencies +# check() { +# cd "$_pkg" +# pytest -x +# } +package() { + cd "$_pkg" + PYTHONHASHSEED=0 python -m installer --destdir="$pkgdir" dist/*.whl } - -package_python2-ngmix-git() { - depends=('python2-numpy' 'python2-numba') - cd "${_pkgname}" - python2 setup.py install --root=${pkgdir} --prefix=/usr --optimize=1 - install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE - -} - diff --git a/setup.py.patch b/setup.py.patch new file mode 100644 index 000000000000..2c4fa17c3922 --- /dev/null +++ b/setup.py.patch @@ -0,0 +1,26 @@ +diff --git a/setup.py b/setup.py +index b46ee9c..0f044c9 100644 +--- a/setup.py ++++ b/setup.py +@@ -1,19 +1,10 @@ +-import os + from setuptools import setup, find_packages + +-__version__ = None +-pth = os.path.join( +- os.path.dirname(os.path.realpath(__file__)), +- "ngmix", +- "_version.py") +-with open(pth, 'r') as fp: +- exec(fp.read()) +- + setup( + name="ngmix", + author="Erin Sheldon", + url="https://github.com/esheldon/ngmix", + description="fast 2-d gaussian mixtures for modeling astronomical images", +- packages=find_packages(exclude=["mdet_tests"]), +- version=__version__, ++ packages=find_packages(exclude=["mdet_tests", "ngmix.tests"]), ++ version='__version__', + ) |