Add patch for astroquery

2 files changed, 77 insertions, 9 deletions

diff --git a/PKGBUILD b/PKGBUILD
index d5256a3795e2..31d8264ab580 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,38 @@
 # Maintainer: Miguel de Val-Borro <miguel.deval at gmail dot com>
-# Contributor: Universebenzene <universebenzene at sina dot com>
+# Maintainer: Universebenzene <universebenzene at sina dot com>
+
 pkgname=('python-astropy-helpers')
 pkgver=4.0.1
-pkgrel=6
+pkgrel=8
 pkgdesc="Utilities used for building the Astropy python library for astronomy"
 arch=('any')
 url="https://astropy-helpers.readthedocs.io/"
-license=('BSD')
-makedepends=('python-setuptools')
-source=("https://files.pythonhosted.org/packages/source/a/astropy-helpers/astropy-helpers-${pkgver}.tar.gz")
-md5sums=('e626e395b4eac6784acb45c5f56e6706')
+license=('BSD-3-Clause')
+makedepends=('python-setuptools'
+             'python-wheel'
+             'python-build'
+             'python-installer')
+source=("https://files.pythonhosted.org/packages/source/a/astropy-helpers/astropy-helpers-${pkgver}.tar.gz"
+        'fix-importlib.patch')
+md5sums=('e626e395b4eac6784acb45c5f56e6706'
+         'b289870dcc9fe1c7744868b454d3cad4')
+
+get_pyver() {
+    python -c "import sys; print('$1'.join(map(str, sys.version_info[:2])))"
+}
+
+build() {
+    cd ${srcdir}/astropy-helpers-${pkgver}
+
+    python -m build --wheel --no-isolation
+}
 
 prepare() {
     cd ${srcdir}/astropy-helpers-${pkgver}
 
-    export _pyver=$(python -c 'import sys; print("%d.%d" % sys.version_info[:2])')
-    sed -e "/astropy_helpers/s:astropy_helpers:/usr/lib/python${_pyver}/site-packages/astropy_helpers:" \
+    sed -e "/astropy_helpers/s:astropy_helpers:/usr/lib/python$(get_pyver .)/site-packages/astropy_helpers:" \
         -i "astropy_helpers/commands/build_sphinx.py"
+    patch -Np1 -i "${srcdir}/fix-importlib.patch"
 }
 
 package() {
@@ -25,5 +41,5 @@ package() {
     install -D -m644 LICENSE.rst -t "${pkgdir}/usr/share/licenses/${pkgname}"
     install -m644 -t "${pkgdir}/usr/share/licenses/${pkgname}" licenses/*
     install -D -m644 README.rst -t "${pkgdir}/usr/share/doc/${pkgname}"
-    python setup.py install --prefix=/usr --root=${pkgdir} --optimize=1
+    python -m installer --destdir="${pkgdir}" dist/*.whl
 }
diff --git a/fix-importlib.patch b/fix-importlib.patch
new file mode 100644
index 000000000000..44a672ab8d2c
--- /dev/null
+++ b/fix-importlib.patch
@@ -0,0 +1,52 @@
+From 9431edf2a6e4692bfbd9e6326f01288d61d414e9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Brigitta=20Sip=C5=91cz?= <bsipocz@gmail.com>
+Date: Mon, 25 Sep 2023 15:07:58 -0700
+Subject: [PATCH] imp --> importlib fixes
+
+---
+ astropy_helpers/utils.py                  | 13 ++++---------
+ 1 files changed, 4 insertions(+), 9 deletions(-)
+
+diff --git a/astropy_helpers/utils.py b/astropy_helpers/utils.py
+index 115c9153..83da4151 100644
+--- a/astropy_helpers/utils.py
++++ b/astropy_helpers/utils.py
+@@ -1,11 +1,11 @@
+ # Licensed under a 3-clause BSD style license - see LICENSE.rst
+ 
+ import contextlib
+-import imp
+ import os
+ import sys
+ import glob
+ 
++import importlib
+ from importlib import machinery as import_machinery
+ 
+ 
+@@ -54,9 +54,8 @@ def get_numpy_include_path():
+     import builtins
+     if hasattr(builtins, '__NUMPY_SETUP__'):
+         del builtins.__NUMPY_SETUP__
+-    import imp
+     import numpy
+-    imp.reload(numpy)
++    importlib.reload(numpy)
+ 
+     try:
+         numpy_include = numpy.get_include()
+@@ -217,12 +216,8 @@ def import_file(filename, name=None):
+     if not os.path.exists(filename):
+         raise ImportError('Could not import file {0}'.format(filename))
+ 
+-    if import_machinery:
+-        loader = import_machinery.SourceFileLoader(name, filename)
+-        mod = loader.load_module()
+-    else:
+-        with open(filename, mode) as fd:
+-            mod = imp.load_module(name, fd, filename, ('.py', mode, 1))
++    loader = import_machinery.SourceFileLoader(name, filename)
++    mod = loader.load_module()
+ 
+     return mod
+