[arch-commits] Commit in tensorboard/trunk (3 files)

[Sven-Hendrik Haase]

    Date: Sunday, July 17, 2022 @ 23:23:05
  Author: svenstaro
Revision: 1254387

upgpkg: tensorboard 2.9.1-2: Remove hard version requirements (Fixes FS#75323)

Modified:
  tensorboard/trunk/PKGBUILD
Deleted:
  tensorboard/trunk/bazel.patch
  tensorboard/trunk/oauthlib-version.patch

------------------------+
 PKGBUILD               |   21 +++++++--------------
 bazel.patch            |   31 -------------------------------
 oauthlib-version.patch |   12 ------------
 3 files changed, 7 insertions(+), 57 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-07-17 22:39:57 UTC (rev 1254386)
+++ PKGBUILD	2022-07-17 23:23:05 UTC (rev 1254387)
@@ -3,7 +3,7 @@
 
 pkgname=tensorboard
 pkgver=2.9.1
-pkgrel=1
+pkgrel=2
 pkgdesc="TensorFlow's Visualization Toolkit"
 url='https://github.com/tensorflow/tensorboard'
 arch=('x86_64')
@@ -13,20 +13,16 @@
          'python-tensorboard_plugin_wit' 'absl-py')
 makedepends=('bazel' 'python-setuptools' 'tree' 'rust' 'python-pip')
 optdepends=('python-tensorflow: advanced features for TensorBoard')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/tensorflow/tensorboard/archive/${pkgver}.tar.gz"
-        oauthlib-version.patch
-        bazel.patch)
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/tensorflow/tensorboard/archive/${pkgver}.tar.gz")
 options=('!lto')
-sha512sums=('795964f63f0d657b3dc9946f1ecbddf1b61605f7f229237396462736f38032630a3426841f1c2ce9f4b8eda7e9c5f7e140fce367af59063d655318be64035fcd'
-            'c85bf0c6e67a19bce0af3ad2dd65851991ba15a6bb7f96433650d5a2725706e015a34166656cfb76874d2498067e6c56bdabb07d114fd9299436f68ebdf50ec3'
-            'b85a33ea074c1a6022fd9c71a0d2477953400c49a1ddbad149ed356061a70f5c60b26b65dae272d1f88c8f6b22b6a12fd1a9a32322876b38d173201f87ab6846')
+sha512sums=('795964f63f0d657b3dc9946f1ecbddf1b61605f7f229237396462736f38032630a3426841f1c2ce9f4b8eda7e9c5f7e140fce367af59063d655318be64035fcd')
 
 prepare() {
   cd "$pkgname-$pkgver"
-  # FS#74460
-  patch -Np1 -i "${srcdir}"/oauthlib-version.patch
-  # fix build
-  #patch -Np1 -i "${srcdir}"/bazel.patch
+
+  # Remove fixed version requirements as we usually ship more up-to-date
+  # versions than are specified and it tends to work fine anyhow.
+  sed -i "s/[<>=].*//" tensorboard/pip_package/requirements.txt
 }
 
 build() {
@@ -60,9 +56,6 @@
   python setup.py install --root="$pkgdir" --optimize=1
 
   rm -r "$pkgdir"/usr/lib/python3.10/site-packages/external/
-
-  _requires="$pkgdir"/usr/lib/python3.10/site-packages/tensorboard-${pkgver}-py3.10.egg-info/requires.txt
-  sed -i 's/tensorboard-data-server.*/tensorboard-data-server/' ${_requires}
 }
 
 # vim:set ts=2 sw=2 et:

Deleted: bazel.patch
===================================================================
--- bazel.patch	2022-07-17 22:39:57 UTC (rev 1254386)
+++ bazel.patch	2022-07-17 23:23:05 UTC (rev 1254387)
@@ -1,31 +0,0 @@
-diff --color -aur tensorboard-2.8.0-old/WORKSPACE tensorboard-2.8.0-new/WORKSPACE
---- tensorboard-2.8.0-old/WORKSPACE	2022-01-20 22:45:42.000000000 +0200
-+++ tensorboard-2.8.0-new/WORKSPACE	2022-04-20 16:09:22.681666037 +0300
-@@ -3,6 +3,14 @@
- load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
- 
- http_archive(
-+    name = "build_bazel_rules_apple",
-+    sha256 = "0052d452af7742c8f3a4e0929763388a66403de363775db7e90adecb2ba4944b",
-+    urls = [
-+        "https://github.com/bazelbuild/rules_apple/releases/download/0.31.3/rules_apple.0.31.3.tar.gz",
-+    ],
-+)
-+
-+http_archive(
-     name = "io_bazel_rules_webtesting",
-     sha256 = "9bb461d5ef08e850025480bab185fd269242d4e533bca75bfb748001ceb343c3",
-     urls = [
-@@ -39,10 +47,9 @@
- 
- http_archive(
-     name = "build_bazel_rules_nodejs",
--    sha256 = "1134ec9b7baee008f1d54f0483049a97e53a57cd3913ec9d6db625549c98395a",
-+    sha256 = "e79c08a488cc5ac40981987d862c7320cee8741122a2649e9b08e850b6f20442",
-     urls = [
--        "http://mirror.tensorflow.org/github.com/bazelbuild/rules_nodejs/releases/download/3.4.0/rules_nodejs-3.4.0.tar.gz",
--        "https://github.com/bazelbuild/rules_nodejs/releases/download/3.4.0/rules_nodejs-3.4.0.tar.gz",
-+        "https://github.com/bazelbuild/rules_nodejs/releases/download/3.8.0/rules_nodejs-3.8.0.tar.gz"
-     ],
- )
- 

Deleted: oauthlib-version.patch
===================================================================
--- oauthlib-version.patch	2022-07-17 22:39:57 UTC (rev 1254386)
+++ oauthlib-version.patch	2022-07-17 23:23:05 UTC (rev 1254387)
@@ -1,12 +0,0 @@
-diff --color -aur tensorboard-2.8.0-old/tensorboard/pip_package/requirements.txt tensorboard-2.8.0-new/tensorboard/pip_package/requirements.txt
---- tensorboard-2.8.0-old/tensorboard/pip_package/requirements.txt	2022-01-20 22:45:42.000000000 +0200
-+++ tensorboard-2.8.0-new/tensorboard/pip_package/requirements.txt	2022-04-20 15:24:05.125066973 +0300
-@@ -21,7 +21,7 @@
- # Until this issue is closed
- # https://github.com/googleapis/google-cloud-python/issues/10566
- google-auth >= 1.6.3, < 3
--google-auth-oauthlib >= 0.4.1, < 0.5
-+google-auth-oauthlib >= 0.4.1
- markdown >= 2.6.8
- numpy >= 1.12.0
- protobuf >= 3.6.0