update to 1.25.0

3 files changed, 104 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 84ba9fba39e9..07e446fe6329 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,37 @@
 pkgbase = pyresample
 	pkgdesc = Geospatial image resampling in Python
-	pkgver = 1.22.3
+	pkgver = 1.25.0
 	pkgrel = 1
 	url = https://github.com/pytroll/pyresample
-	arch = any
+	arch = x86_64
 	license = LGPL3
 	makedepends = cython
-	depends = python-setuptools
-	depends = python-pyproj
+	makedepends = git
+	makedepends = python-build
+	makedepends = python-installer
+	makedepends = python-oldest-supported-numpy
+	makedepends = python-versioneer-518
+	makedepends = python-wheel
+	depends = python>=3.8
 	depends = python-configobj
+	depends = python-numpy
 	depends = python-pykdtree
+	depends = python-pyproj
+	depends = python-setuptools
 	depends = python-yaml
 	optdepends = python-numexpr: used to optimize some bottlenecks
-	optdepends = python-matplotlib
-	optdepends = python-rasterio
 	optdepends = python-cartopy
 	optdepends = python-dask
-	optdepends = python-xarray
+	optdepends = python-matplotlib
+	optdepends = python-rasterio
 	optdepends = python-shapely
+	optdepends = python-xarray
 	optdepends = python-zarr
-	source = https://github.com/pytroll/pyresample/archive/v1.22.3.tar.gz
-	sha512sums = 12f3a7039a0dcf611bba546d2e3fd2f44b95620959a3240e36c690cdccc27f35e4d5c10a924568368ef57c90aba765f4446fdb460fa6b168d238c43e8e5001b2
+	provides = python-pyresample
+	source = pyresample::git+https://github.com/pytroll/pyresample#commit=93df018?signed
+	source = setup.py.patch
+	validpgpkeys = 0CEE1C80170AEA74FEEF700DD0DB5057C9F9D380
+	sha256sums = SKIP
+	sha256sums = f51c28743db217f124f33c42334a97cc86d01cd9a96728f67ca3c05de39042f9
 
 pkgname = pyresample
diff --git a/PKGBUILD b/PKGBUILD
index 968e16d0fb0d..788ea2867f37 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,60 @@
+# Maintainer: Luis Martinez <luis dot martinez at disroot dot org>
 # Contributor graziano.giuliani <graziano.giuliani@gmail.com>
 # Contributor: Rich Lindsley <rich at dranek dot com>
+
+## GPG key: https://github.com/djhoese.gpg
+
 pkgname=pyresample
 pkgrel=1
-pkgver=1.22.3
+pkgver=1.25.0
+_commit=93df018
 pkgdesc="Geospatial image resampling in Python"
-arch=(any)
-url="https://github.com/pytroll/${pkgname}"
-depends=(python-setuptools python-pyproj python-configobj python-pykdtree python-yaml)
-optdepends=('python-numexpr: used to optimize some bottlenecks'
-  'python-matplotlib'
-  'python-rasterio'
+arch=('x86_64')
+license=('LGPL3')
+url="https://github.com/pytroll/pyresample"
+depends=(
+	'python>=3.8'
+	'python-configobj'
+	'python-numpy'
+	'python-pykdtree'
+	'python-pyproj'
+	'python-setuptools'
+	'python-yaml')
+optdepends=(
+	'python-numexpr: used to optimize some bottlenecks'
   'python-cartopy'
   'python-dask'
-  'python-xarray'
+  'python-matplotlib'
+  'python-rasterio'
   'python-shapely'
+  'python-xarray'
   'python-zarr')
-makedepends=(cython)
-license=(LGPL3)
-source=(${url}/archive/v${pkgver}.tar.gz)
-sha512sums=('12f3a7039a0dcf611bba546d2e3fd2f44b95620959a3240e36c690cdccc27f35e4d5c10a924568368ef57c90aba765f4446fdb460fa6b168d238c43e8e5001b2')
+makedepends=(
+	'cython'
+	'git'
+	'python-build'
+	'python-installer'
+	'python-oldest-supported-numpy'
+	'python-versioneer-518'
+	'python-wheel')
+provides=('python-pyresample')
+source=("$pkgname::git+$url#commit=$_commit?signed"
+        'setup.py.patch')
+sha256sums=('SKIP'
+            'f51c28743db217f124f33c42334a97cc86d01cd9a96728f67ca3c05de39042f9')
+validpgpkeys=('0CEE1C80170AEA74FEEF700DD0DB5057C9F9D380') ## David Hoese
+
+prepare() {
+	patch -p1 -d "$pkgname" < setup.py.patch
+	sed -i "s/\$PKGVER/$pkgver/" "$pkgname/setup.py"
+}
 
 build() {
-  cd ${pkgname}-${pkgver}
-  export PYTHONHASHSEED=0
-  python setup.py build_ext --inplace
+	cd "$pkgname"
+	python -m build --wheel --no-isolation
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
-  PYTHONPYCACHEPREFIX="${PWD}/.cache/cpython/" python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1
-  install -Dm 644 LICENSE.txt -t "${pkgdir}/usr/share/licenses/${pkgname}"
+	cd "$pkgname"
+	PYTHONHASHSEED=0 python -m installer --destdir="$pkgdir" dist/*.whl
 }
diff --git a/setup.py.patch b/setup.py.patch
new file mode 100644
index 000000000000..32043a0a1c44
--- /dev/null
+++ b/setup.py.patch
@@ -0,0 +1,38 @@
+diff --git a/setup.py b/setup.py
+index e6c67e6..0b7cbf0 100644
+--- a/setup.py
++++ b/setup.py
+@@ -52,7 +52,7 @@ test_requires = ['rasterio', 'dask', 'xarray', 'cartopy>=0.20.0', 'pillow', 'mat
+ if sys.platform.startswith("win"):
+     extra_compile_args = []
+ else:
+-    extra_compile_args = ["-O3", "-Wno-unused-function"]
++    extra_compile_args = ["-O2", "-Wno-unused-function"]
+ 
+ extensions = [
+     Extension("pyresample.ewa._ll2cr", sources=["pyresample/ewa/_ll2cr.pyx"],
+@@ -82,7 +82,7 @@ if __name__ == "__main__":
+     README = open('README.md', 'r').read()
+     setup(name='pyresample',
+           url='https://github.com/pytroll/pyresample',
+-          version=versioneer.get_version(),
++          version='$PKGVER',
+           cmdclass=cmdclass,
+           description='Geospatial image resampling in Python',
+           long_description=README,
+@@ -90,13 +90,12 @@ if __name__ == "__main__":
+           author='Thomas Lavergne',
+           author_email='t.lavergne@met.no',
+           package_dir={'pyresample': 'pyresample'},
+-          packages=find_packages(),
+-          package_data={'pyresample.test': ['test_files/*']},
++          packages=find_packages(exclude=['pyresample.test*']),
+           python_requires='>=3.8',
+           setup_requires=setup_requires,
+           install_requires=requirements,
+           extras_require=extras_require,
+-          ext_modules=cythonize(extensions),
++          ext_modules=cythonize(extensions, language_level = "3"),
+           entry_points=entry_points,
+           zip_safe=False,
+           classifiers=[