diff --git a/0001-Bumps-google-auth-oauthlib-dependency-restriction.patch b/0001-Bumps-google-auth-oauthlib-dependency-restriction.patch index b3d90fcab0ae12e64a8683211b2d16bbe315c9c4..e1a90f28ca5f1351bdb743d3b4a2c2bdc4ac57aa 100644 --- a/0001-Bumps-google-auth-oauthlib-dependency-restriction.patch +++ b/0001-Bumps-google-auth-oauthlib-dependency-restriction.patch @@ -1,6 +1,6 @@ -From a98b915f607ffa2ac5a3913dc91a1da2cccf4876 Mon Sep 17 00:00:00 2001 -From: desert-sailor -Date: Sat, 6 May 2023 16:35:45 +0800 +From a98b915f607ffa2ac5a3913dc91a1da2cccf4876 Mon Sep 17 00:00:00 2001 +From: desert-sailor +Date: Sat, 6 May 2023 16:35:45 +0800 Subject: [PATCH] Bumps google-auth-oauthlib dependency restriction --- @@ -8,18 +8,18 @@ Subject: [PATCH] Bumps google-auth-oauthlib dependency restriction 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tensorboard/pip_package/requirements.txt b/tensorboard/pip_package/requirements.txt -index e782cef..665da8a 100644 +index 5003a8513..e8c122853 100644 --- a/tensorboard/pip_package/requirements.txt +++ b/tensorboard/pip_package/requirements.txt -@@ -21,7 +21,7 @@ grpcio >= 1.24.3 - # Until this issue is closed - # https://github.com/googleapis/google-cloud-python/issues/10566 +@@ -19,7 +19,7 @@ absl-py >= 0.4 + # NOTE: this version should be >= the grpc version in our WORKSPACE file. + grpcio >= 1.48.2 google-auth >= 1.6.3, < 3 -google-auth-oauthlib >= 0.4.1, < 0.5 +google-auth-oauthlib >= 0.5, < 1.1 markdown >= 2.6.8 numpy >= 1.12.0 - # Protobuf 4.0 is incompatible with TF. Force < 3.20 until they unblock upgrade. + # NOTE: this version must be >= the protoc version in our WORKSPACE file. -- 2.33.0 diff --git a/2.10.1.tar.gz b/2.12.0.tar.gz similarity index 64% rename from 2.10.1.tar.gz rename to 2.12.0.tar.gz index 6b9e612b2e7a767abdd84f2d3f401f95de0391e7..4b84e03f44ae2d6decc93c01a5f41d03ebfe0e93 100644 Binary files a/2.10.1.tar.gz and b/2.12.0.tar.gz differ diff --git a/bazel-tensorboard-external.tar.gzaa b/bazel-tensorboard-external.tar.gzaa index 9938c4cca4f0c6de52227537fab86bc054e5c353..2f2c81ad4064255bc11f6d1372eeb006510e86f1 100644 Binary files a/bazel-tensorboard-external.tar.gzaa and b/bazel-tensorboard-external.tar.gzaa differ diff --git a/bazel-tensorboard-external.tar.gzab b/bazel-tensorboard-external.tar.gzab index 63621dff0a5d0e305ae5aec20aa77351863ef036..f06e74794704fa180e7497189f643fa3b8bb3dba 100644 Binary files a/bazel-tensorboard-external.tar.gzab and b/bazel-tensorboard-external.tar.gzab differ diff --git a/bazel-tensorboard-external.tar.gzac b/bazel-tensorboard-external.tar.gzac index ce4cadde3099cddde8263e9f1e5cc210bbb435e1..4a623fe95c928b5391209d1562632493c6cf12c8 100644 Binary files a/bazel-tensorboard-external.tar.gzac and b/bazel-tensorboard-external.tar.gzac differ diff --git a/tensorboard.spec b/tensorboard.spec index 2d6bb8c8423f230854d76091d0e125ddc40805dc..ce562053d96932a24db91db1f6a2a0794d68d578 100644 --- a/tensorboard.spec +++ b/tensorboard.spec @@ -1,12 +1,12 @@ %global _empty_manifest_terminate_build 0 Name: python-tensorboard -Version: 2.10.1 -Release: 2 +Version: 2.12.0 +Release: 1 Summary: TensorBoard lets you watch Tensors Flow License: Apache 2.0 URL: https://github.com/tensorflow/tensorboard Source0: https://github.com/tensorflow/tensorboard/archive/refs/tags/%{version}.tar.gz -Source1: https://files.pythonhosted.org/packages/74/69/5747a957f95e2e1d252ca41476ae40ce79d70d38151d2e494feb7722860c/tensorboard_data_server-0.6.1-py3-none-any.whl +Source1: https://files.pythonhosted.org/packages/da/61/6e9ff8258422d287eec718872fb71e05324356722ab658c8afda25f51539/tensorboard_data_server-0.7.1-py3-none-any.whl Source2: bazel-tensorboard-external.tar.gzaa Source3: bazel-tensorboard-external.tar.gzab Source4: bazel-tensorboard-external.tar.gzac @@ -86,39 +86,39 @@ patch -d ${extdir}/external -p1 < %{SOURCE5} cat %{SOURCE6} %{SOURCE7} > adds-aarch64-cache.tar.gz tar xzvf adds-aarch64-cache.tar.gz -C ${extdir} %endif -ln -sfn $(find ${extdir}/../install -name embedded_tools) ${extdir}/external/bazel_tools -ln -sfn $(find ${extdir}/../install -maxdepth 2 -name platforms) ${extdir}/external/platforms -ln -sf ${extdir}/external/io_bazel_rules_go/go/private/compat/v25.bzl ${extdir}/external/io_bazel_rules_go_compat/compat.bzl -ln -sf ${extdir}/external/bazel_tools/tools/cpp/armeabi_cc_toolchain_config.bzl ${extdir}/external/local_config_cc/armeabi_cc_toolchain_config.bzl -ln -sf ${extdir}/external/bazel_tools/tools/cpp/unix_cc_toolchain_config.bzl ${extdir}/external/local_config_cc/cc_toolchain_config.bzl -ln -sfn $(find /usr/lib/jvm -maxdepth 1 -name java-11-openjdk)/bin ${extdir}/external/local_jdk/bin -ln -sfn $(find /usr/lib/jvm -maxdepth 1 -name java-11-openjdk)/conf ${extdir}/external/local_jdk/conf -ln -sfn $(find /usr/lib/jvm -maxdepth 1 -name java-11-openjdk)/include ${extdir}/external/local_jdk/include -ln -sfn $(find /usr/lib/jvm -maxdepth 1 -name java-11-openjdk)/legal ${extdir}/external/local_jdk/legal -ln -sfn $(find /usr/lib/jvm -maxdepth 1 -name java-11-openjdk)/lib ${extdir}/external/local_jdk/lib -ln -sfn $(find /usr/lib/jvm -maxdepth 1 -name java-11-openjdk)/release ${extdir}/external/local_jdk/release -ln -sfn $(find /usr/lib/jvm -maxdepth 1 -name java-11-openjdk)/tapset ${extdir}/external/local_jdk/tapset -ln -sf ${extdir}/external/nodejs_linux_amd64/node_info ${extdir}/external/build_bazel_rules_sass_deps/_node_info -ln -sf ${extdir}/external/nodejs_linux_amd64/node_info ${extdir}/external/esbuild_npm/_node_info -ln -sf ${extdir}/external/nodejs_linux_amd64/node_info ${extdir}/external/npm/_node_info -ln -sfn ${extdir}/external/build_bazel_rules_sass_deps/_/sass/node_modules ${extdir}/external/build_bazel_rules_sass_deps/node_modules -ln -sfn ${extdir}/external/esbuild_npm/_/toolchains/esbuild/node_modules ${extdir}/external/esbuild_npm/node_modules -ln -sfn ${extdir}/external/npm/_/node_modules ${extdir}/external/npm/node_modules -ln -sf ${extdir}/external/nodejs_linux_amd64/yarn_info ${extdir}/external/build_bazel_rules_sass_deps/_yarn_info -ln -sf ${extdir}/external/nodejs_linux_amd64/yarn_info ${extdir}/external/esbuild_npm/_yarn_info -ln -sf ${extdir}/external/nodejs_linux_amd64/yarn_info ${extdir}/external/npm/_yarn_info -ln -sf ${extdir}/external/io_bazel_rules_sass/sass/yarn.lock ${extdir}/external/build_bazel_rules_sass_deps/_/sass/yarn.lock -ln -sf ${_builddir}/tensorboard-2.10.1/yarn.lock ${extdir}/external/npm/_/yarn.lock -ln -sf ${extdir}/external/build_bazel_rules_nodejs/toolchains/esbuild/package-lock.json ${extdir}/external/esbuild_npm/_/toolchains/esbuild/package-lock.json -oldstr='/root/.cache/bazel/_bazel_root/4351bb8fec5747e15a0a9b257c950736/' -sed -i s#${oldstr}#${extdir}#g `grep ${oldstr} -rl ${extdir}` -grep ${extdir} -rl ${extdir} +#ln -sfn $(find ${extdir}/../install -name embedded_tools) ${extdir}/external/bazel_tools +#ln -sfn $(find ${extdir}/../install -maxdepth 2 -name platforms) ${extdir}/external/platforms +#ln -sf ${extdir}/external/io_bazel_rules_go/go/private/compat/v25.bzl ${extdir}/external/io_bazel_rules_go_compat/compat.bzl +#ln -sf ${extdir}/external/bazel_tools/tools/cpp/armeabi_cc_toolchain_config.bzl ${extdir}/external/local_config_cc/armeabi_cc_toolchain_config.bzl +#ln -sf ${extdir}/external/bazel_tools/tools/cpp/unix_cc_toolchain_config.bzl ${extdir}/external/local_config_cc/cc_toolchain_config.bzl +#ln -sfn $(find /usr/lib/jvm -maxdepth 1 -name java-11-openjdk)/bin ${extdir}/external/local_jdk/bin +#ln -sfn $(find /usr/lib/jvm -maxdepth 1 -name java-11-openjdk)/conf ${extdir}/external/local_jdk/conf +#ln -sfn $(find /usr/lib/jvm -maxdepth 1 -name java-11-openjdk)/include ${extdir}/external/local_jdk/include +#ln -sfn $(find /usr/lib/jvm -maxdepth 1 -name java-11-openjdk)/legal ${extdir}/external/local_jdk/legal +#ln -sfn $(find /usr/lib/jvm -maxdepth 1 -name java-11-openjdk)/lib ${extdir}/external/local_jdk/lib +#ln -sfn $(find /usr/lib/jvm -maxdepth 1 -name java-11-openjdk)/release ${extdir}/external/local_jdk/release +#ln -sfn $(find /usr/lib/jvm -maxdepth 1 -name java-11-openjdk)/tapset ${extdir}/external/local_jdk/tapset +#ln -sf ${extdir}/external/nodejs_linux_amd64/node_info ${extdir}/external/build_bazel_rules_sass_deps/_node_info +#ln -sf ${extdir}/external/nodejs_linux_amd64/node_info ${extdir}/external/esbuild_npm/_node_info +#ln -sf ${extdir}/external/nodejs_linux_amd64/node_info ${extdir}/external/npm/_node_info +#ln -sfn ${extdir}/external/build_bazel_rules_sass_deps/_/sass/node_modules ${extdir}/external/build_bazel_rules_sass_deps/node_modules +#ln -sfn ${extdir}/external/esbuild_npm/_/toolchains/esbuild/node_modules ${extdir}/external/esbuild_npm/node_modules +#ln -sfn ${extdir}/external/npm/_/node_modules ${extdir}/external/npm/node_modules +#ln -sf ${extdir}/external/nodejs_linux_amd64/yarn_info ${extdir}/external/build_bazel_rules_sass_deps/_yarn_info +#ln -sf ${extdir}/external/nodejs_linux_amd64/yarn_info ${extdir}/external/esbuild_npm/_yarn_info +#ln -sf ${extdir}/external/nodejs_linux_amd64/yarn_info ${extdir}/external/npm/_yarn_info +#ln -sf ${extdir}/external/io_bazel_rules_sass/sass/yarn.lock ${extdir}/external/build_bazel_rules_sass_deps/_/sass/yarn.lock +#ln -sf ${_builddir}/tensorboard-2.10.1/yarn.lock ${extdir}/external/npm/_/yarn.lock +#ln -sf ${extdir}/external/build_bazel_rules_nodejs/toolchains/esbuild/package-lock.json ${extdir}/external/esbuild_npm/_/toolchains/esbuild/package-lock.json +#oldstr='/root/.cache/bazel/_bazel_root/4351bb8fec5747e15a0a9b257c950736/' +#sed -i s#${oldstr}#${extdir}#g `grep ${oldstr} -rl ${extdir}` +#grep ${extdir} -rl ${extdir} %build mkdir dist cp %{SOURCE1} dist -# bazel --output_user_root=`pwd`/../output_user_root build //tensorboard/pip_package:build_pip_package --verbose_failures --experimental_local_memory_estimate --jobs=16 -bazel --output_user_root=`pwd`/../output_user_root run //tensorboard/pip_package:extract_pip_package -- `pwd`/dist +bazel --output_user_root=`pwd`/../output_user_root build //tensorboard/pip_package:build_pip_package --verbose_failures --experimental_local_memory_estimate --jobs=16 +#bazel --output_user_root=`pwd`/../output_user_root run //tensorboard/pip_package:extract_pip_package -- `pwd`/dist %install %py3_install_wheel * @@ -148,6 +148,9 @@ mv %{buildroot}/doclist.lst . %{_docdir}/* %changelog +* Sat Aug 05 2023 zhuofeng - 2.12.0-1 +- upgrade to version 2.12.0 + * Sat May 06 2023 Dongxing Wang - 2.10.1-2 - change depends google-auth diff --git a/tensorboard_data_server-0.7.1-py3-none-any.whl b/tensorboard_data_server-0.7.1-py3-none-any.whl new file mode 100644 index 0000000000000000000000000000000000000000..c29809e24a7bc761532339cddd781d982328ae70 Binary files /dev/null and b/tensorboard_data_server-0.7.1-py3-none-any.whl differ