Date: Friday, November 25, 2022 @ 20:50:05 Author: kgizdov Revision: 1353921
upgpkg: python-tensorboard_plugin_wit 1.8.1-4: remove pip dep Added: python-tensorboard_plugin_wit/trunk/add_zlib.patch Modified: python-tensorboard_plugin_wit/trunk/PKGBUILD ----------------+ PKGBUILD | 35 ++++++++++++++++++++--------------- add_zlib.patch | 18 ++++++++++++++++++ 2 files changed, 38 insertions(+), 15 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-11-25 20:47:52 UTC (rev 1353920) +++ PKGBUILD 2022-11-25 20:50:05 UTC (rev 1353921) @@ -1,24 +1,26 @@ # Maintainer: Konstantin Gizdov <arch at kge dot pw> -pkgbase=python-tensorboard_plugin_wit -pkgname=(python-tensorboard_plugin_wit python-witwidget) _pkgbase=tensorboard_plugin_wit +pkgbase="python-${_pkgbase}" +pkgname=("python-${_pkgbase}" python-witwidget) _bzlver=3.6.0 # latest Bazel that is supported for building pkgdesc='The What-If Tool (WIT): An easy-to-use interface for expanding understanding of a black-box classification or regression ML model.' url='https://pair-code.github.io/what-if-tool' license=('Apache') pkgver=1.8.1 -pkgrel=3 +pkgrel=4 arch=('any') source=("${_pkgbase}-${pkgver}::git+https://github.com/PAIR-code/what-if-tool#tag=v${pkgver}" - "https://github.com/bazelbuild/bazel/releases/download/${_bzlver}/bazel-${_bzlver}-linux-x86_64"{,.sig}) + "https://github.com/bazelbuild/bazel/releases/download/${_bzlver}/bazel-${_bzlver}-linux-x86_64"{,.sig} + 'add_zlib.patch') _common_depends=('python-google-api-python-client' 'python-ipywidgets') -makedepends=('git' 'npm' 'python-virtualenv' 'python-pip' "${_common_depends[@]}") +makedepends=('git' 'npm' 'python-virtualenv' 'python-setuptools-scm' 'python-build' 'python-installer' 'python-wheel' "${_common_depends[@]}") validpgpkeys=('71A1D0EFCFEB6281FD0437C93D5919B448457EE0') # "Bazel Developer (Bazel APT repository key) <bazel-...@googlegroups.com>" depends=('python-werkzeug' 'tensorboard') -sha256sums=('SKIP' - 'b2985c3ad1ec0284a66749b635ac11b323bc6b964d2cfcf33721746243a19530' - 'SKIP') +b2sums=('SKIP' + 'cfe73c0b3f5e54fa65b034cb8fd4e54976126e9af09dba6ea3fa3f5e32be4909908bd0ec95f162f30cdde67855bc4d8d5a8ffebd959e01238b586f9b0fd763ae' + 'SKIP' + 'ffc30dd67139e2e915f6a227ac5e27b3770019a5c83b0d729442a141eb48e389493285f2389e1cf161807d80ac107a79afd91eb148af8d6188dced5233f5709d') get_pyver () { python -c 'import sys; print(str(sys.version_info[0]) + "." + str(sys.version_info[1]))' @@ -32,11 +34,14 @@ cp "${srcdir}/bazel-${_bzlver}-linux-x86_64" "$(_bzlcmd)" chmod +x "$(_bzlcmd)" cd "${srcdir}/${_pkgbase}-${pkgver}" - sed -e "s@version=\"1.8.0\"@version=\"${pkgver}\"@g" -i \ - tensorboard_plugin_wit/pip_package/setup.py - sed -e 's@/tmp/wit-pip@${BUILD_WORKSPACE_DIRECTORY}/wit-pip@g' -i \ - tensorboard_plugin_wit/pip_package/build_pip_package.sh \ - witwidget/pip_package/build_pip_package.sh + sed -e "s@version=\"1.8.0\"@version=\"${pkgver}\"@g" \ + -i tensorboard_plugin_wit/pip_package/setup.py + sed -e 's@/tmp/wit-pip@${BUILD_WORKSPACE_DIRECTORY}/wit-pip@g' \ + -e '/pip install -qU wheel/d' \ + -i tensorboard_plugin_wit/pip_package/build_pip_package.sh \ + witwidget/pip_package/build_pip_package.sh + + patch -Np1 -i "${srcdir}/add_zlib.patch" } build() { @@ -53,7 +58,7 @@ local _pyver="$(get_pyver)" cd "${srcdir}/${_pkgbase}-${pkgver}" install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - PIP_CONFIG_FILE=/dev/null pip install --isolated --root="$pkgdir" --ignore-installed --no-deps wit-pip/release/dist/tensorboard_plugin_wit-${pkgver}-py3*.whl + python -m installer --destdir="$pkgdir" wit-pip/release/dist/tensorboard_plugin_wit-${pkgver}-py3*.whl } package_python-witwidget() { pkgdesc='What-If Tool Notebook Widget.' @@ -66,7 +71,7 @@ local _pyver="$(get_pyver)" cd "${srcdir}/${_pkgbase}-${pkgver}" install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - PIP_CONFIG_FILE=/dev/null pip install --isolated --root="$pkgdir" --ignore-installed --no-deps wit-pip/release/dist/witwidget-${pkgver}-py3*.whl + python -m installer --destdir="$pkgdir" wit-pip/release/dist/witwidget-${pkgver}-py3*.whl rm -rf "${pkgdir}/usr/lib/python${_pyver}/site-packages/${_pkgbase}" install -d "${pkgdir}/etc/jupyter/nbconfig/notebook.d" mv "${pkgdir}/usr/etc/jupyter/nbconfig/notebook.d/wit-widget.json" "${pkgdir}/etc/jupyter/nbconfig/notebook.d/wit-widget.json" Added: add_zlib.patch =================================================================== --- add_zlib.patch (rev 0) +++ add_zlib.patch 2022-11-25 20:50:05 UTC (rev 1353921) @@ -0,0 +1,18 @@ +diff --color -aur tensorboard_plugin_wit-1.8.1-old/WORKSPACE tensorboard_plugin_wit-1.8.1-new/WORKSPACE +--- tensorboard_plugin_wit-1.8.1-old/WORKSPACE 2022-11-25 22:30:42.405732907 +0200 ++++ tensorboard_plugin_wit-1.8.1-new/WORKSPACE 2022-11-25 22:31:51.022397184 +0200 +@@ -13,6 +13,14 @@ + ], + ) + ++http_archive( ++ name = "zlib", ++ build_file = "@com_google_protobuf//:third_party/zlib.BUILD", ++ sha256 = "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1", ++ strip_prefix = "zlib-1.2.11", ++ urls = ["https://zlib.net/fossils/zlib-1.2.11.tar.gz"], ++) ++ + load("@bazel_skylib//lib:versions.bzl", "versions") + # Keep this version in sync with the BAZEL environment variable defined + # in our .travis.yml config.