Update to version 1.2022.1228.1

3 files changed, 37 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6510dcf66c33..6997d33d494a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,24 @@
 pkgbase = python-astroslam
-	pkgdesc = Stellar LAbel Machine (SLAM)
-	pkgver = 1.2020.1104.0
+	pkgdesc = A forward model using SVR to estimate stellar parameters from spectra
+	pkgver = 1.2022.1228.1
 	pkgrel = 1
 	url = https://github.com/hypergravity/astroslam
 	arch = any
 	license = MIT
-	checkdepends = python-pyzmq
-	checkdepends = python-jupyter_client
-	checkdepends = python-pillow
+	checkdepends = python-nose
 	makedepends = python-setuptools
 	depends = python-matplotlib
 	depends = python-scikit-learn
 	depends = python-pandas
 	depends = python-emcee
 	depends = python-astropy
+	depends = python-laspec
 	depends = python-lmfit
 	depends = python-ipyparallel
 	depends = python-joblib
-	source = https://files.pythonhosted.org/packages/source/a/astroslam/astroslam-1.2020.1104.0.tar.gz
-	source = https://raw.githubusercontent.com/hypergravity/astroslam/master/LICENSE
-	md5sums = a7ca825f5ea1d6c20c348f0046284209
-	md5sums = SKIP
+	source = https://files.pythonhosted.org/packages/source/a/astroslam/astroslam-1.2022.1228.1.tar.gz
+	source = fix-for-py3.10.patch
+	md5sums = c6bf949451893e3b65907d672948b45d
+	md5sums = 608081da9f7168903bae4e63de7be4bc
 
 pkgname = python-astroslam
diff --git a/PKGBUILD b/PKGBUILD
index 2dc9bb388774..fcae3c3af8c8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,19 +2,27 @@
 pkgbase=python-astroslam
 _pyname=${pkgbase#python-}
 pkgname=("python-${_pyname}")
-pkgver=1.2020.1104.0
+pkgver=1.2022.1228.1
 pkgrel=1
-pkgdesc="Stellar LAbel Machine (SLAM)"
+pkgdesc="A forward model using SVR to estimate stellar parameters from spectra"
 arch=('any')
 url="https://github.com/hypergravity/astroslam"
 license=('MIT')
 makedepends=('python-setuptools')
-depends=('python-matplotlib' 'python-scikit-learn' 'python-pandas' 'python-emcee' 'python-astropy' 'python-lmfit' 'python-ipyparallel' 'python-joblib')
-checkdepends=('python-pyzmq' 'python-jupyter_client' 'python-pillow')
+depends=('python-matplotlib' 'python-scikit-learn' 'python-pandas' 'python-emcee' 'python-astropy' 'python-laspec' 'python-lmfit' 'python-ipyparallel' 'python-joblib')
+#checkdepends=('python-pyzmq' 'python-jupyter_client' 'python-pillow')
+checkdepends=('python-nose')
 source=("https://files.pythonhosted.org/packages/source/${_pyname:0:1}/${_pyname}/${_pyname}-${pkgver}.tar.gz"
-        "https://raw.githubusercontent.com/hypergravity/astroslam/master/LICENSE")
-md5sums=('a7ca825f5ea1d6c20c348f0046284209'
-         'SKIP')
+        'fix-for-py3.10.patch')
+#       "https://raw.githubusercontent.com/hypergravity/astroslam/master/LICENSE")
+md5sums=('c6bf949451893e3b65907d672948b45d'
+         '608081da9f7168903bae4e63de7be4bc')
+
+prepare() {
+    cd ${srcdir}/${_pyname}-${pkgver}
+
+    patch -Np1 -i "${srcdir}/fix-for-py3.10.patch"
+}
 
 build() {
     cd ${srcdir}/${_pyname}-${pkgver}
@@ -25,13 +33,13 @@ build() {
 check() {
     cd ${srcdir}/${_pyname}-${pkgver}
 
-    python setup.py test || warning "Tests failed"
+    nosetests || warning "Tests failed"
 }
 
 package() {
     cd ${srcdir}/${_pyname}-${pkgver}
 
-    install -D -m644 -t "${pkgdir}/usr/share/licenses/${pkgname}" "${srcdir}/LICENSE"
+    install -D -m644 -t "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
     install -D -m644 README.md doc/* -t "${pkgdir}/usr/share/doc/${pkgname}"
     python setup.py install --root=${pkgdir} --prefix=/usr --optimize=1
 }
diff --git a/fix-for-py3.10.patch b/fix-for-py3.10.patch
new file mode 100644
index 000000000000..8c3eaeb3f6fe
--- /dev/null
+++ b/fix-for-py3.10.patch
@@ -0,0 +1,12 @@
+--- a/slam/utils.py	2018-12-12 17:31:03.000000000 +0800
++++ b/slam/utils.py	2023-05-21 18:14:57.324104970 +0800
+@@ -23,7 +23,8 @@
+ 
+ """
+ import sys
+-from collections import OrderedDict, Set, Mapping, deque
++from collections import OrderedDict, deque
++from collections.abc import Set, Mapping
+ from numbers import Number
+ 
+ import numpy as np