Update from upstream

2 files changed, 53 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 43d98f0b26a4..3bb32bb40942 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,34 +1,38 @@
 pkgbase = python-einsteinpy-git
 	pkgdesc = Python package for General Relativity
-	pkgver = 0.3.1.r29.g6285c79
+	pkgver = 0.3.1.r68.ge7f648b
 	pkgrel = 1
 	url = https://einsteinpy.org
-	arch = i686
-	arch = x86_64
+	arch = any
 	license = MIT
 	checkdepends = python-pytest-doctestplus
-	checkdepends = python-matplotlib
-	checkdepends = python-sympy
-	checkdepends = python-plotly
-	checkdepends = python-astropy
-	checkdepends = python-numba
-	checkdepends = python-einsteinpy_geodesics
 	makedepends = git
 	makedepends = python-setuptools
-	makedepends = python-scipy
+	makedepends = python-wheel
+	makedepends = python-build
+	makedepends = python-installer
+	makedepends = python-numpy
 	makedepends = python-nbsphinx
+	makedepends = python-astropy
+	makedepends = python-matplotlib
+	makedepends = python-numba
+	makedepends = python-plotly
+	makedepends = python-scipy
+	makedepends = python-sympy
 	makedepends = pandoc
+	makedepends = python-ipywidgets
 	makedepends = graphviz
 	source = git+https://github.com/einsteinpy/einsteinpy
 	md5sums = SKIP
 
 pkgname = python-einsteinpy-git
-	depends = python>=3.6
-	depends = python-astropy
-	depends = python-matplotlib
-	depends = python-plotly
-	depends = python-sympy
-	depends = python-numba
+	depends = python>=3.8
+	depends = python-astropy>=5.1.1
+	depends = python-matplotlib>=3.6.2
+	depends = python-plotly>=5.11.0
+	depends = python-scipy>=1.9.3
+	depends = python-sympy>=1.11.1
+	depends = python-numba>=0.56.3
 	optdepends = python-einsteinpy-doc: Documentation for EinsteinPy
 	provides = python-einsteinpy
 	conflicts = python-einsteinpy
@@ -37,4 +41,3 @@ pkgname = python-einsteinpy-doc-git
 	pkgdesc = Documentation for EinsteinPy
 	provides = python-einsteinpy-doc
 	conflicts = python-einsteinpy-doc
-
diff --git a/PKGBUILD b/PKGBUILD
index 9f4b38c29cf1..0b6393a64a30 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,17 +2,38 @@
 pkgbase=python-einsteinpy-git
 _gitname=einsteinpy
 pkgname=("python-${_gitname}-git" "python-${_gitname}-doc-git")
-pkgver=0.3.1.r29.g6285c79
+pkgver=0.3.1.r68.ge7f648b
 pkgrel=1
 pkgdesc="Python package for General Relativity"
-arch=('i686' 'x86_64')
+arch=('any')
 url="https://einsteinpy.org"
 license=('MIT')
-makedepends=('git' 'python-setuptools' 'python-scipy' 'python-nbsphinx' 'pandoc' 'graphviz')
-checkdepends=('python-pytest-doctestplus' 'python-matplotlib' 'python-sympy' 'python-plotly' 'python-astropy' 'python-numba' 'python-einsteinpy_geodesics')
+makedepends=('git'
+             'python-setuptools'
+             'python-wheel'
+             'python-build'
+             'python-installer'
+             'python-numpy'
+             'python-nbsphinx'
+             'python-astropy'
+             'python-matplotlib'
+             'python-numba'
+             'python-plotly'
+             'python-scipy'
+             'python-sympy'
+             'pandoc'
+             'python-ipywidgets'
+             'graphviz')
+checkdepends=('python-pytest-doctestplus')
+#             'python-einsteinpy_geodesics'
+# 'python-astropy' 'python-matplotlib' 'python-scipy' 'python-sympy' 'python-plotly' 'python-numba' satisfied
 source=("git+https://github.com/einsteinpy/einsteinpy")
 md5sums=('SKIP')
 
+get_pyver() {
+    python -c "import sys; print('$1'.join(map(str, sys.version_info[:2])))"
+}
+
 pkgver() {
     cd "${srcdir}/${_gitname}"
 
@@ -31,35 +52,36 @@ pkgver() {
 
 build() {
     cd ${srcdir}/${_gitname}
-    python setup.py build
+    python -m build --wheel --no-isolation
 
     msg "Building Docs"
-    PYTHONPATH="build/lib" python setup.py build_sphinx
+    cd ${srcdir}/${_gitname}/docs
+    PYTHONPATH="../build/lib" make html
 }
 
 check() {
     cd ${srcdir}/${_gitname}
 
-    PYTHONPATH="build/lib" pytest tests
+    PYTHONPATH="build/lib" pytest tests || warning "Tests failed" # -vv --color=yes
 }
 
 package_python-einsteinpy-git() {
-    depends=('python>=3.6' 'python-astropy' 'python-matplotlib' 'python-plotly' 'python-sympy' 'python-numba')
+    depends=('python>=3.8' 'python-astropy>=5.1.1' 'python-matplotlib>=3.6.2' 'python-plotly>=5.11.0' 'python-scipy>=1.9.3' 'python-sympy>=1.11.1' 'python-numba>=0.56.3')
     optdepends=('python-einsteinpy-doc: Documentation for EinsteinPy')
     provides=("${pkgname%-git}")
     conflicts=("${pkgname%-git}")
     cd ${srcdir}/${_gitname}
 
     install -D -m644 -t "${pkgdir}/usr/share/licenses/${pkgname}" COPYING
-    install -D -m644 README.rst *.ipynb -t "${pkgdir}/usr/share/doc/${pkgname}"
-    python setup.py install --root=${pkgdir} --prefix=/usr --optimize=1
+    install -D -m644 README.rst -t "${pkgdir}/usr/share/doc/${pkgname}"
+    python -m installer --destdir="${pkgdir}" dist/*.whl
 }
 
 package_python-einsteinpy-doc-git() {
     pkgdesc="Documentation for EinsteinPy"
     provides=("${pkgname%-git}")
     conflicts=("${pkgname%-git}")
-    cd ${srcdir}/${_gitname}/build/sphinx
+    cd ${srcdir}/${_gitname}/docs/build
 
     install -D -m644 -t "${pkgdir}/usr/share/licenses/${pkgname}" ../../COPYING
     install -d -m755 "${pkgdir}/usr/share/doc/${pkgbase}"