py-tensorboard: add new versions (#21545)

2 files changed, 27 insertions, 18 deletions

diff --git a/var/spack/repos/builtin/packages/py-tensorboard-plugin-wit/package.py b/var/spack/repos/builtin/packages/py-tensorboard-plugin-wit/package.py
index 2ab06e504f..cc6fce343a 100644
--- a/var/spack/repos/builtin/packages/py-tensorboard-plugin-wit/package.py
+++ b/var/spack/repos/builtin/packages/py-tensorboard-plugin-wit/package.py
@@ -3,6 +3,8 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+import tempfile
+
 
 class PyTensorboardPluginWit(Package):
     """The What-If Tool makes it easy to efficiently and
@@ -20,9 +22,10 @@ class PyTensorboardPluginWit(Package):
     maintainers = ['aweits']
 
     version('master', branch='master')
+    version('1.8.0', sha256='1e4de1bbf6ae61c4d27b114ec2e1093bc4765b8c2bbb2cc5d43e2075b08a5fea')
     version('1.7.0', sha256='30dcab9065b02c3f1476f4fb92b27f6feb6c00cdb281699c44d8e69c86745247')
 
-    depends_on('bazel@0.26.1:', type='build')
+    depends_on('bazel@:2.1.0', type='build')
     depends_on('py-setuptools@36.2.0:', type='build')
     depends_on('python@2.7:2.8,3.2:', type=('build', 'run'))
     depends_on('py-wheel', type='build')
@@ -34,9 +37,8 @@ class PyTensorboardPluginWit(Package):
     phases = ['setup', 'build', 'install']
 
     def setup_build_environment(self, env):
-        tmp_path = '/tmp/spack/tb-plugin'
-        mkdirp(tmp_path)
-        env.set('TEST_TMPDIR', tmp_path)
+        self.tmp_path = tempfile.mkdtemp(dir='/tmp', prefix='spack')
+        env.set('TEST_TMPDIR', self.tmp_path)
 
     def setup(self, spec, prefix):
         builddir = join_path(self.stage.source_path, 'spack-build')
@@ -61,18 +63,19 @@ class PyTensorboardPluginWit(Package):
                     'tensorboard_plugin_wit/pip_package/build_pip_package.sh')
 
     def build(self, spec, prefix):
-        tmp_path = env['TEST_TMPDIR']
         bazel('--nohome_rc',
               '--nosystem_rc',
-              '--output_user_root=' + tmp_path,
+              '--output_user_root=' + self.tmp_path,
               'run',
               # watch https://github.com/bazelbuild/bazel/issues/7254
               '--define=EXECUTOR=remote',
               '--verbose_failures',
               '--subcommands=pretty_print',
+              '--spawn_strategy=local',
               'tensorboard_plugin_wit/pip_package:build_pip_package')
 
     def install(self, spec, prefix):
         with working_dir('spack-build/release'):
             setup_py('install', '--prefix={0}'.format(prefix),
                      '--single-version-externally-managed', '--root=/')
+        remove_linked_tree(self.tmp_path)
diff --git a/var/spack/repos/builtin/packages/py-tensorboard/package.py b/var/spack/repos/builtin/packages/py-tensorboard/package.py
index c3e51cbff6..2f043eafd1 100644
--- a/var/spack/repos/builtin/packages/py-tensorboard/package.py
+++ b/var/spack/repos/builtin/packages/py-tensorboard/package.py
@@ -3,6 +3,8 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+import tempfile
+
 
 class PyTensorboard(Package):
     """TensorBoard is a suite of web applications for
@@ -14,29 +16,29 @@ class PyTensorboard(Package):
 
     maintainers = ['aweits']
 
+    version('2.4.1', sha256='736dc204aa292d221f5871077e60994a9a9ea8e33b841f0d754d510fe6cc7635')
+    version('2.4.0', sha256='28a30794c1c797357b2086477394b59afa0b18ca48592ca3c0627f7f10536373')
     version('2.3.0', sha256='947a58702c2841eb4559637dbf8639633f79de9a0f422be9737f3563a1725440')
     version('2.2.0', sha256='d0dfbf0e4b3b5ebbc3fafa6d281d4b9aa5478eac6bac3330652ab6674278ab77')
 
     depends_on('python@2.7:2.8,3.2:', type=('build', 'run'))
-    depends_on('bazel@0.26.1:', type='build')
+    depends_on('bazel@2.1.0:', type='build', when='@2.2.0:')
     depends_on('py-setuptools@41.0.0:', type=('build', 'run'))
     depends_on('py-absl-py@0.4:', type=('build', 'run'))
     depends_on('py-markdown@2.6.8:', type=('build', 'run'))
     depends_on('py-requests@2.21.0:2.999', type=('build', 'run'))
     depends_on('py-futures@3.1.1:', type=('build', 'run'), when='^python@:2')
-    depends_on('py-grpcio@1.24.3:', type=('build', 'run'), when='@2.3.0')
-    depends_on('py-grpcio@1.23.3:', type=('build', 'run'), when='@2.2.0')
+    depends_on('py-grpcio@1.24.3:', type=('build', 'run'), when='@2.3:')
+    depends_on('py-grpcio@1.23.3:', type=('build', 'run'), when='@2.2')
     depends_on('py-google-auth@1.6.3:1.99.99', type=('build', 'run'))
     depends_on('py-numpy@1.12.0:', type=('build', 'run'))
     depends_on('py-protobuf@3.6.0:', type=('build', 'run'))
     depends_on('py-six@1.10.0:', type=('build', 'run'))
     depends_on('py-werkzeug@0.11.15:', type=('build', 'run'))
-    depends_on('py-wheel', type='build')
-    depends_on('py-wheel@0.26:', type='build', when='@0.6: ^python@3:')
+    depends_on('py-wheel', type=('build', 'run'))
+    depends_on('py-wheel@0.26:', type=('build', 'run'), when='@0.6: ^python@3:')
     depends_on('py-google-auth-oauthlib@0.4.1:0.4.999', type=('build', 'run'))
     depends_on('py-tensorboard-plugin-wit@1.6.0:', type=('build', 'run'), when='@2.2.0:')
-    depends_on('py-tensorflow-estimator@2.2.0', type='run', when='@2.2.0')
-    depends_on('py-tensorflow-estimator@2.3.0', type='run', when='@2.3.0')
 
     extends('python')
 
@@ -53,9 +55,8 @@ class PyTensorboard(Package):
                     '.bazelrc')
 
     def setup_build_environment(self, env):
-        tmp_path = '/tmp/spack/tb'
-        mkdirp(tmp_path)
-        env.set('TEST_TMPDIR', tmp_path)
+        self.tmp_path = tempfile.mkdtemp(dir='/tmp', prefix='spack')
+        env.set('TEST_TMPDIR', self.tmp_path)
 
     def configure(self, spec, prefix):
         builddir = join_path(self.stage.source_path, 'spack-build')
@@ -81,12 +82,16 @@ class PyTensorboard(Package):
         filter_file('python setup.py',
                     '{0} setup.py'.format(spec['python'].command.path),
                     'tensorboard/pip_package/build_pip_package.sh')
+        if self.spec.satisfies('@2.4.0:'):
+            filter_file('"@npm//@polymer/polymer",',
+                        '"@npm//@polymer/polymer",\n'
+                        '"@npm//@types/d3",',
+                        'tensorboard/plugins/projector/vz_projector/BUILD')
 
     def build(self, spec, prefix):
-        tmp_path = env['TEST_TMPDIR']
         bazel('--nohome_rc',
               '--nosystem_rc',
-              '--output_user_root=' + tmp_path,
+              '--output_user_root=' + self.tmp_path,
               'build',
               # watch https://github.com/bazelbuild/bazel/issues/7254
               '--define=EXECUTOR=remote',
@@ -99,3 +104,4 @@ class PyTensorboard(Package):
         with working_dir('spack-build'):
             setup_py('install', '--prefix={0}'.format(prefix),
                      '--single-version-externally-managed', '--root=/')
+        remove_linked_tree(self.tmp_path)