Date: Thursday, December 10, 2020 @ 15:26:57 Author: svenstaro Revision: 773047
archrelease: copy trunk to community-x86_64 Added: tensorboard/repos/community-x86_64/PKGBUILD (from rev 773046, tensorboard/trunk/PKGBUILD) Deleted: tensorboard/repos/community-x86_64/PKGBUILD tensorboard/repos/community-x86_64/bump-tensorflow.patch tensorboard/repos/community-x86_64/fix-grpc-deps.patch -----------------------+ PKGBUILD | 119 +++++++++++++++++++++--------------------------- bump-tensorflow.patch | 18 ------- fix-grpc-deps.patch | 47 ------------------ 3 files changed, 54 insertions(+), 130 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-12-10 15:26:52 UTC (rev 773046) +++ PKGBUILD 2020-12-10 15:26:57 UTC (rev 773047) @@ -1,65 +0,0 @@ -# Maintainer: Sven-Hendrik Haase <svenst...@gmail.com> - -pkgname=tensorboard -pkgver=2.3.0 -pkgrel=5 -pkgdesc="TensorFlow's Visualization Toolkit" -url='https://github.com/tensorflow/tensorboard' -arch=('x86_64') -license=('APACHE') -depends=('python' 'python-werkzeug' 'python-numpy' 'python-bleach' 'python-wheel' 'python-markdown' - 'python-html5lib' 'python-protobuf' 'python-setuptools' 'python-grpcio' 'python-google-auth-oauthlib' - 'python-tensorboard_plugin_wit' 'absl-py') -optdepends=('python-tensorflow: advanced features for TensorBoard') -makedepends=('bazel' 'tree') -source=("${pkgname}-${pkgver}::https://github.com/tensorflow/tensorboard/archive/${pkgver}.tar.gz" - 'bump-tensorflow.patch' - 'fix-grpc-deps.patch') -sha512sums=('0f3299be1fc69d4e2c5cf4ee49a79bbed7b8321f8daa7dfb39390dce17fef4b11db72c8090503d10b152cfeed06aa8935ddbe8d18049692c3f4394c5cdee833f' - '87b38bb13b580f29ff4a28b150ee572b651630686292a73e1accf79b964433e9e4b19ca6193c5098ad642fee51fa2d3c97139c7bc1b7c1f9763d18710458d375' - 'e3b339285ea1ee46e0cc560f9ef509d2307d15090bc740ae9cc322daafd1ccccdb118045ffff8b565a234043049c5208679bb982360b7b364df7d97ffe671669') - -prepare() { - cd "$pkgname-$pkgver" - - patch -Np1 -i "${srcdir}/bump-tensorflow.patch" - patch -Np1 -i "${srcdir}/fix-grpc-deps.patch" -} - -build() { - cd "$pkgname-$pkgver" - - bazel build --experimental_repo_remote_exec tensorboard:tensorboard - bazel build --experimental_repo_remote_exec //tensorboard/pip_package:build_pip_package - - mkdir pypackage - cp -R bazel-bin/tensorboard/pip_package/build_pip_package.runfiles/org_tensorflow_tensorboard/external pypackage - cp -R bazel-bin/tensorboard/pip_package/build_pip_package.runfiles/org_tensorflow_tensorboard/tensorboard pypackage - cp tensorboard/pip_package/{README.rst,MANIFEST.in,setup.py,requirements.txt} pypackage - cp README.md pypackage - cd pypackage - python setup.py build -} - -package() { - cd "$pkgname-$pkgver" - - install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - - cd pypackage - python setup.py install --root="$pkgdir" --optimize=1 - - rm -r "$pkgdir"/usr/lib/python3.9/site-packages/external/ - - _requires="$pkgdir"/usr/lib/python3.9/site-packages/tensorboard-${pkgver}-py3.9.egg-info/requires.txt - # This is ugly: We need to patch it to use current bleach and html5lib - # because old ones are not even compatible with Python 3.6 and we don't have - # those in Arch of course. - sed -i 's/bleach==.*/bleach/' ${_requires} - sed -i 's/html5lib==.*/html5lib/' ${_requires} - # Other ugly hack: workaround for issues 650 - # https://github.com/tensorflow/tensorboard/issues/650 - sed -i '/^futures/d' ${_requires} -} - -# vim:set ts=2 sw=2 et: Copied: tensorboard/repos/community-x86_64/PKGBUILD (from rev 773046, tensorboard/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-12-10 15:26:57 UTC (rev 773047) @@ -0,0 +1,54 @@ +# Maintainer: Sven-Hendrik Haase <svenst...@gmail.com> + +pkgname=tensorboard +pkgver=2.4.0 +pkgrel=1 +pkgdesc="TensorFlow's Visualization Toolkit" +url='https://github.com/tensorflow/tensorboard' +arch=('x86_64') +license=('APACHE') +depends=('python' 'python-werkzeug' 'python-numpy' 'python-bleach' 'python-wheel' 'python-markdown' + 'python-html5lib' 'python-protobuf' 'python-setuptools' 'python-grpcio' 'python-google-auth-oauthlib' + 'python-tensorboard_plugin_wit' 'absl-py') +optdepends=('python-tensorflow: advanced features for TensorBoard') +makedepends=('bazel' 'tree') +source=("${pkgname}-${pkgver}::https://github.com/tensorflow/tensorboard/archive/${pkgver}.tar.gz") +sha512sums=('f9df59c1b3e200bb64fb49ad8e025aea34a6ac9c97cc29a2f7f28850a2f6853b00e1ac07c66b0d78cc0e14bc60b461fd639c83288c2315fa70811aeaa57a1cde') + +build() { + cd "$pkgname-$pkgver" + + bazel build --experimental_repo_remote_exec tensorboard:tensorboard + bazel build --experimental_repo_remote_exec //tensorboard/pip_package:build_pip_package + + mkdir pypackage + cp -R bazel-bin/tensorboard/pip_package/build_pip_package.runfiles/org_tensorflow_tensorboard/external pypackage + cp -R bazel-bin/tensorboard/pip_package/build_pip_package.runfiles/org_tensorflow_tensorboard/tensorboard pypackage + cp tensorboard/pip_package/{README.rst,MANIFEST.in,setup.py,requirements.txt} pypackage + cp README.md pypackage + cd pypackage + python setup.py build +} + +package() { + cd "$pkgname-$pkgver" + + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + + cd pypackage + python setup.py install --root="$pkgdir" --optimize=1 + + rm -r "$pkgdir"/usr/lib/python3.9/site-packages/external/ + + _requires="$pkgdir"/usr/lib/python3.9/site-packages/tensorboard-${pkgver}-py3.9.egg-info/requires.txt + # This is ugly: We need to patch it to use current bleach and html5lib + # because old ones are not even compatible with Python 3.6 and we don't have + # those in Arch of course. + sed -i 's/bleach==.*/bleach/' ${_requires} + sed -i 's/html5lib==.*/html5lib/' ${_requires} + # Other ugly hack: workaround for issues 650 + # https://github.com/tensorflow/tensorboard/issues/650 + sed -i '/^futures/d' ${_requires} +} + +# vim:set ts=2 sw=2 et: Deleted: bump-tensorflow.patch =================================================================== --- bump-tensorflow.patch 2020-12-10 15:26:52 UTC (rev 773046) +++ bump-tensorflow.patch 2020-12-10 15:26:57 UTC (rev 773047) @@ -1,18 +0,0 @@ -diff -aur tensorboard-2.2.0-old/WORKSPACE tensorboard-2.2.0-new/WORKSPACE ---- tensorboard-2.2.0-old/WORKSPACE 2020-03-24 15:41:29.000000000 +0200 -+++ tensorboard-2.2.0-new/WORKSPACE 2020-03-26 12:40:24.515353787 +0200 -@@ -103,11 +103,10 @@ - name = "org_tensorflow", - # NOTE: when updating this, MAKE SURE to also update the protobuf_js runtime version - # in third_party/workspace.bzl to >= the protobuf/protoc version provided by TF. -- sha256 = "638e541a4981f52c69da4a311815f1e7989bf1d67a41d204511966e1daed14f7", -- strip_prefix = "tensorflow-2.1.0", -+ sha256 = "69cd836f87b8c53506c4f706f655d423270f5a563b76dc1cfa60fbc3184185a3", -+ strip_prefix = "tensorflow-2.2.0", - urls = [ -- "http://mirror.tensorflow.org/github.com/tensorflow/tensorflow/archive/v2.1.0.tar.gz", # 2020-01-06 -- "https://github.com/tensorflow/tensorflow/archive/v2.1.0.tar.gz", -+ "https://github.com/tensorflow/tensorflow/archive/v2.2.0.tar.gz", - ], - ) - Deleted: fix-grpc-deps.patch =================================================================== --- fix-grpc-deps.patch 2020-12-10 15:26:52 UTC (rev 773046) +++ fix-grpc-deps.patch 2020-12-10 15:26:57 UTC (rev 773047) @@ -1,47 +0,0 @@ -diff -aur tensorboard-2.2.0-old/third_party/workspace.bzl tensorboard-2.2.0-new/third_party/workspace.bzl ---- tensorboard-2.2.0-old/third_party/workspace.bzl 2020-03-24 15:41:29.000000000 +0200 -+++ tensorboard-2.2.0-new/third_party/workspace.bzl 2020-04-07 18:09:49.309586469 +0300 -@@ -55,6 +55,18 @@ - actual = "@org_pythonhosted_six", - ) - -+ # gRPC's BUILD file depends on //external:protobuf_clib. -+ native.bind( -+ name = "protobuf_clib", -+ actual = "@com_google_protobuf//:protoc_lib", -+ ) -+ -+ # gRPC's BUILD file depends on //external:protobuf_headers. -+ native.bind( -+ name = "protobuf_headers", -+ actual = "@com_google_protobuf//:protobuf_headers", -+ ) -+ - platform_http_file( - name = "org_chromium_chromium", - licenses = ["notice"], # BSD 3-clause (maybe more?) -diff -aur tensorboard-2.2.0-old/WORKSPACE tensorboard-2.2.0-new/WORKSPACE ---- tensorboard-2.2.0-old/WORKSPACE 2020-04-07 18:11:04.789583868 +0300 -+++ tensorboard-2.2.0-new/WORKSPACE 2020-04-07 18:11:15.819583488 +0300 -@@ -113,6 +113,21 @@ - load("@org_tensorflow//tensorflow:workspace.bzl", "tf_workspace") - tf_workspace() - -+# add upb dep -+http_archive( -+ name = "upb", -+ urls = [ -+ "https://github.com/protocolbuffers/upb/archive/ef25ea52814b48f1d945e25b5b1b19b04eea3ad8.tar.gz" -+ ], -+ strip_prefix = "upb-ef25ea52814b48f1d945e25b5b1b19b04eea3ad8", -+ sha256 = "03dd5e19e1b653a3b2d7f50a3cc3ed913a72a0ecaf0d667c5f4df3ab3c8587c2", -+) -+# load("@upb//bazel:workspace_deps.bzl", "upb_deps") -+# load("@upb//bazel:upb_proto_library.bzl", "upb_deps") -+# upb_deps() -+# load("@upb//bazel:grpc_deps.bzl", "grpc_my_deps") -+# grpc_my_deps() -+ - # Please add all new dependencies in workspace.bzl. - load("//third_party:workspace.bzl", "tensorboard_workspace") - tensorboard_workspace()