Update to version 0.6.1

2 files changed, 44 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2312cbfed3e1..de606bc6ca0c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,25 @@
 pkgbase = python-jupyter-cache
 	pkgdesc = A defined interface for working with a cache of jupyter notebooks
-	pkgver = 0.5.0
+	pkgver = 0.6.1
 	pkgrel = 1
 	url = https://jupyter-cache.readthedocs.io
 	arch = any
 	license = MIT
-	checkdepends = python-tabulate
+	checkdepends = python-pytest
 	checkdepends = python-click
-	checkdepends = python-jupyter_client
+	checkdepends = python-importlib-metadata
+	checkdepends = python-jupytext
+	checkdepends = python-nbdime
 	checkdepends = jupyter-nbclient
 	checkdepends = jupyter-nbformat
-	checkdepends = python-yaml
 	checkdepends = python-sqlalchemy
-	makedepends = python-setuptools
-	source = https://files.pythonhosted.org/packages/source/j/jupyter-cache/jupyter-cache-0.5.0.tar.gz
-	md5sums = 967f1e73243dbfe9e94aed413845e499
+	checkdepends = python-tabulate
+	checkdepends = python-yaml
+	makedepends = python-flit-core
+	makedepends = python-build
+	makedepends = python-installer
+	source = https://github.com/executablebooks/jupyter-cache/archive/refs/tags/v0.6.1.tar.gz
+	md5sums = 18376504e5882af3b74801f55fe77546
 
 pkgname = python-jupyter-cache
 	depends = python-attrs
@@ -24,7 +29,7 @@ pkgname = python-jupyter-cache
 	depends = python-yaml
 	depends = jupyter-nbformat
 	depends = jupyter-nbclient
-	depends = python-sqlalchemy<1.5
+	depends = python-sqlalchemy<3
 	optdepends = python-click-log: cli
 	optdepends = python-jupytext: rtd
 	optdepends = python-myst-nb: rtd
diff --git a/PKGBUILD b/PKGBUILD
index 03f89cd0f515..24ba358a5d63 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,40 +3,54 @@ pkgbase=python-jupyter-cache
 _pyname=${pkgbase#python-}
 pkgname=("python-${_pyname}")
 #"python-${_pyname}-doc")
-pkgver=0.5.0
+pkgver=0.6.1
 pkgrel=1
 pkgdesc="A defined interface for working with a cache of jupyter notebooks"
 arch=('any')
 url="https://jupyter-cache.readthedocs.io"
 license=('MIT')
-makedepends=('python-setuptools')
-checkdepends=('python-tabulate'
-               'python-click'
-               'python-jupyter_client'
-               'jupyter-nbclient'
-               'jupyter-nbformat'
-               'python-yaml'
-               'python-sqlalchemy')
-source=("https://files.pythonhosted.org/packages/source/${_pyname:0:1}/${_pyname}/${_pyname}-${pkgver}.tar.gz")
-md5sums=('967f1e73243dbfe9e94aed413845e499')
+makedepends=('python-flit-core'
+             'python-build'
+             'python-installer')
+#            'python-sphinx-copybutton'
+#            'python-sphinx-book-theme'
+#            'python-myst-nb'
+#            'python-myst-parser<0.19'
+#            'python-jupytext'
+#            'python-nbdime')   # myst-nb: circular dep
+checkdepends=('python-pytest'
+              'python-click'
+              'python-importlib-metadata'
+              'python-jupytext'
+              'python-nbdime'
+              'jupyter-nbclient'
+              'jupyter-nbformat'
+              'python-sqlalchemy'
+              'python-tabulate'
+              'python-yaml')
+#source=("https://files.pythonhosted.org/packages/source/${_pyname:0:1}/${_pyname}/${_pyname}-${pkgver}.tar.gz")
+source=("https://github.com/executablebooks/jupyter-cache/archive/refs/tags/v${pkgver}.tar.gz")
+md5sums=('18376504e5882af3b74801f55fe77546')
 
 build() {
     cd ${srcdir}/${_pyname}-${pkgver}
-    python setup.py build
+    python -m build --wheel --no-isolation
 
 #   msg "Building Docs"
-#   python setup.py build_sphinx
+#   make -C docs html
 }
 
 check() {
     cd ${srcdir}/${_pyname}-${pkgver}
 
-    python setup.py test || warning "Tests failed"
-#   pytest #|| warning "Tests failed"
+    mkdir -p dist/lib
+    bsdtar -xpf dist/${_pyname/-/_}-${pkgver}-py3-none-any.whl -C dist/lib
+    PYTHONPATH="dist/lib" pytest || warning "Tests failed" # -vv --color=yes
+#       --deselect=tests/test_cache.py::test_execution_jupytext
 }
 
 package_python-jupyter-cache() {
-    depends=('python-attrs' 'python-click' 'python-importlib-metadata' 'python-tabulate' 'python-yaml' 'jupyter-nbformat' 'jupyter-nbclient' 'python-sqlalchemy<1.5')
+    depends=('python-attrs' 'python-click' 'python-importlib-metadata' 'python-tabulate' 'python-yaml' 'jupyter-nbformat' 'jupyter-nbclient' 'python-sqlalchemy<3')
     optdepends=('python-click-log: cli'
                 'python-jupytext: rtd'
                 'python-myst-nb: rtd'
@@ -48,7 +62,7 @@ package_python-jupyter-cache() {
 
     install -D -m644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
     install -D -m644 README.md -t "${pkgdir}/usr/share/doc/${pkgname}"
-    python setup.py install --root=${pkgdir} --prefix=/usr --optimize=1
+    python -m installer --destdir="${pkgdir}" dist/*.whl
 }
 
 #package_python-jupyter-cache-doc() {