Update to 6.0.0

2 files changed, 27 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 414148dec6da..dc9cad07801f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,12 @@
 pkgbase = mathicsscript
 	pkgdesc = A more advanced command-line interface to Mathics.
-	pkgver = 5.0.0
+	pkgver = 6.0.0
 	pkgrel = 1
-	url = https://github.com/Mathics3/mathicsscript
+	url = https://mathics.org/
 	arch = any
 	license = GPL3
-	checkdepends = python-pytest
-	checkdepends = python-yaml
-	depends = mathics>=5.0.0
-	depends = mathics<5.1.0
-	depends = mathics-scanner>=1.2.4
-	depends = readline
+	depends = mathics>6.0.0
+	depends = mathics-scanner>=1.3.0
 	depends = python-click
 	depends = python-colorama
 	depends = python-columnize
@@ -19,12 +15,12 @@ pkgbase = mathicsscript
 	depends = python-pygments>=2.9.0
 	depends = mathics-pygments>=1.0.2
 	depends = python-term-background>=1.0.1
-	optdepends = python-matplotlib: For rending plots and graphs
-	optdepends = python-cariosvg: For rendering plots and graphs as SVGs via matplotlib
+	optdepends = python-yaml: Used for admin-tools/make-tables.sh to build JSON tables
 	optdepends = python-pyqt5: For inte ractive display of graphs via matplotlib
-	optdepends = asymptote: 3D Graphics
+	optdepends = python-cariosvg: For rendering plots and graphs as SVGs via matplotlib
 	optdepends = python-cson: for xasy
-	source = mathicsscript-5.0.0.tar.gz::https://github.com/Mathics3/mathicsscript/archive/refs/tags/5.0.0.tar.gz
-	sha256sums = 0564abf9156ec51efed05746521d10cce52c63dec0c224938eac5c25c83a13c1
+	optdepends = python-matplotlib: For rendering SVG plots
+	source = mathicsscript-6.0.0.tar.gz::https://github.com/Mathics3/mathicsscript/releases/download/6.0.0/mathicsscript-6.0.0.tar.gz
+	sha256sums = 4e0268236c5c19d6bb7c68b8935e91163f78e78761ff83ec094b441c8ff55ae3
 
 pkgname = mathicsscript
diff --git a/PKGBUILD b/PKGBUILD
index cef16532eca2..1cfaa4f5f243 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,15 @@
-# Maintainer: Techcable <Techcable at techcable dot net>
+# Maintainer: Victor <v1c70rp@gmail.com>
+# Contributor: Techcable <Techcable at techcable dot net>
+
 pkgname=mathicsscript
-pkgver=5.0.0
+pkgver=6.0.0
 pkgrel=1
 pkgdesc="A more advanced command-line interface to Mathics."
 arch=("any")
-url="https://github.com/Mathics3/mathicsscript"
+url="https://mathics.org/"
 license=('GPL3')
-groups=()
-depends=("mathics>=5.0.0" "mathics<5.1.0"
-         "mathics-scanner>=1.2.4"
-         "readline"
+depends=("mathics>6.0.0"
+         "mathics-scanner>=1.3.0"
          "python-click"
          "python-colorama"
          "python-columnize"
@@ -18,50 +18,31 @@ depends=("mathics>=5.0.0" "mathics<5.1.0"
          "python-pygments>=2.9.0"
          "mathics-pygments>=1.0.2"
          "python-term-background>=1.0.1")
-checkdepends=(
-    "python-pytest"
-    "python-yaml"
-)
 optdepends=(
-    "python-matplotlib: For rending plots and graphs"
-    "python-cariosvg: For rendering plots and graphs as SVGs via matplotlib"
+    "python-yaml: Used for admin-tools/make-tables.sh to build JSON tables"
     "python-pyqt5: For inte ractive display of graphs via matplotlib"
-    "asymptote: 3D Graphics"
+    "python-cariosvg: For rendering plots and graphs as SVGs via matplotlib"
     "python-cson: for xasy"
+    "python-matplotlib: For rendering SVG plots"
 )
-backup=() # Do we have any config files?
-options=()
-install=
 source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/refs/tags/${pkgver}.tar.gz")
-sha256sums=('0564abf9156ec51efed05746521d10cce52c63dec0c224938eac5c25c83a13c1')
-validpgpkeys=()
+source=("$pkgname-$pkgver.tar.gz::https://github.com/Mathics3/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.gz")
+sha256sums=('4e0268236c5c19d6bb7c68b8935e91163f78e78761ff83ec094b441c8ff55ae3')
 
 prepare() {
-    # We prepare a 'hack bin' for the tests
-    cd "$pkgname-$pkgver"
-    mkdir -p "hack-bin"
-    echo -e '#!/bin/bash\npython3 -m mathicsscript "$@"' > "hack-bin/${pkgname}"
-    chmod +x "hack-bin/${pkgname}"
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    curl -O "https://raw.githubusercontent.com/Mathics3/$pkgname/$pkgver/requirements-dev.txt"
+    curl -O "https://raw.githubusercontent.com/Mathics3/$pkgname/$pkgver/requirements-full.txt"
 }
 
 build() {
-    cd "$pkgname-$pkgver"
+    cd "${srcdir}/${pkgname}-${pkgver}"
     python setup.py build
 }
 
-check() {
-    cd "$pkgname-$pkgver"
-    # Test environment needs this -_-
-    # Essentially they assume we've already been installed
-    export PYTHONPATH="."
-    # NOTE: This includes a 'mathicsscript' executable
-    export PATH="$PATH:$(pwd)/hack-bin"
-    pytest test
-}
-
 package() {
-    cd "$pkgname-$pkgver"
-    python setup.py install --root="${pkgdir}/" --prefix="usr/"
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
     # For some reason, setuptools seems to like including these
     # test files....
     rm -r "${pkgdir}"/usr/lib/python*/site-packages/test