Date: Sunday, April 23, 2023 @ 05:15:56 Author: yan12125 Revision: 1448348
python-nbdime: update to 3.2.0 * Reorder dependencies following setup.py * Remove no longer needed python-six and python-ipython-genutils [1][2] * Remove npm from makedepends - not needed for a PyPI tarball as the latter includes built frontend artifacts * jupyter-notebook and python-packaging are needed for notebook 6 support only [3] * Drop no longer needed hacks [1] https://github.com/jupyter/nbdime/pull/586 [2] https://github.com/jupyter/nbdime/pull/618 [3] https://github.com/jupyter/nbdime/pull/656 Modified: python-nbdime/trunk/PKGBUILD ----------+ PKGBUILD | 43 +++++++++++++++++-------------------------- 1 file changed, 17 insertions(+), 26 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-04-23 03:50:23 UTC (rev 1448347) +++ PKGBUILD 2023-04-23 05:15:56 UTC (rev 1448348) @@ -4,34 +4,33 @@ # Contributor: Dominik Stańczak <stanczakdominik at gmail dot com> pkgname=python-nbdime -pkgver=3.1.1+32+g9fbfd46 -_commit=9fbfd4656d9ce66c44b62154097808da5df9bf48 +pkgver=3.2.0 pkgrel=1 pkgdesc='Diff and merge of Jupyter Notebooks' url='https://github.com/jupyter/nbdime' -makedepends=(python-build python-installer python-setuptools python-wheel python-tabulate - npm git) -depends=(python python-gitpython python-six jupyter-nbformat python-tornado - python-colorama python-pygments python-requests python-jinja - python-ipython-genutils jupyter-server jupyter-server-mathjax) +makedepends=(python-build python-installer python-setuptools python-wheel + python-tabulate jupyter-notebook python-packaging) +# Dependencies follow the order in setup.py +depends=(python jupyter-nbformat python-colorama python-pygments python-tornado + python-requests python-gitpython jupyter-server jupyter-server-mathjax + python-jinja + # following are detected by namcap and not listed in setup.py + python-traitlets python-jupyter-core) checkdepends=(mercurial python-jsonpatch python-pytest python-pytest-timeout python-pytest-tornado) optdepends=( 'python-tabulate: for nbdime.profiling' + 'jupyter-notebook: support for notebook 6' + 'python-packaging: support for notebook 6' ) provides=(jupyterlab-extension-nbdime jupyter-nbdime) license=(BSD) arch=(any) -source=("git+https://github.com/jupyter/nbdime#commit=$_commit";) -sha256sums=('SKIP') +source=(https://files.pythonhosted.org/packages/source/n/nbdime/nbdime-$pkgver.tar.gz) +sha256sums=('e50d1a0cf672e02356e10e6d3d0aea8e8612a534ae6e1b9bfd59ac3b60c405eb') -pkgver() { - cd nbdime - git describe --tags | sed 's/-/+/g' -} - prepare() { - cd nbdime + cd nbdime-$pkgver # Many tests need a valid git config as well as assume `master` as the default branch cat > gitconfig <<EOF @@ -38,20 +37,12 @@ [user] name = builduser email = builduser@archlinux -[init] - defaultBranch = master EOF } build() { - cd nbdime + cd nbdime-$pkgver - # nbdime uses old webpack - # Similar issue: https://github.com/archlinux/svntogit-community/commit/b6d534155399e99d19b3fe3db61cd3ffd6095dba - # Related: https://github.com/jupyter/nbdime/issues/614 (3.1.1: pep517 build fails), - # https://github.com/jupyter/nbdime/pull/632 (chore: upgrade webpack to version - closed due to incompatibility with webpack plugins) - export NODE_OPTIONS="--openssl-legacy-provider" - # Many indirect dependencies are not declared in PKGBUILDs of dependent packages # jupyterlab is included in pyproject.toml as the jupyter command is needed for builds # https://github.com/jupyter/nbdime/pull/572#discussion_r611501164 @@ -59,7 +50,7 @@ } check() { - cd nbdime + cd nbdime-$pkgver local site_packages=$(python -c "import site; print(site.getsitepackages()[0])") python -m installer --destdir="$PWD/tmp_install" dist/*.whl @@ -68,7 +59,7 @@ } package() { - cd nbdime + cd nbdime-$pkgver python -m installer --destdir="$pkgdir" dist/*.whl mv "$pkgdir"/usr/etc "$pkgdir"/etc
