py-tensorflow-estimator: update for 2.4.0 (#21546)

* py-tensorflow-estimator: update for 2.4.0

* build/run deptypes, switch to common tmpfile logic

1 files changed, 14 insertions, 17 deletions

diff --git a/var/spack/repos/builtin/packages/py-tensorflow-estimator/package.py b/var/spack/repos/builtin/packages/py-tensorflow-estimator/package.py
index 9aa31cb8fd..6b79631bed 100644
--- a/var/spack/repos/builtin/packages/py-tensorflow-estimator/package.py
+++ b/var/spack/repos/builtin/packages/py-tensorflow-estimator/package.py
@@ -4,6 +4,7 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack import *
+import tempfile
 
 
 class PyTensorflowEstimator(Package):
@@ -15,6 +16,7 @@ class PyTensorflowEstimator(Package):
 
     maintainers = ['aweits']
 
+    version('2.4.0', sha256='e6ea12014c3d8c89a81ace95f8f8b7c39ffcd3e4e4626709e4aee0010eefd962')
     version('2.3.0', sha256='75403e7de7e8ec30ec0781ede56ed84cbe5e90daad64a9c242cd489c8fe63a17')
     version('2.2.0', sha256='2d68cb6e6442e7dcbfa2e092aa25bdcb0eda420536a829b85d732854a4c85d46')
     version('2.1', sha256='1d74c8181b981748976fa33ad97d3434c3cf2b7e29a0b00861365fe8329dbc4e')
@@ -23,34 +25,27 @@ class PyTensorflowEstimator(Package):
 
     extends('python')
 
-    depends_on('py-tensorflow@2.3.0:',  when='@2.3.0')
-    depends_on('py-tensorflow@2.2.0',  when='@2.2.0')
-    depends_on('py-tensorflow@2.1.0:2.1.999',  when='@2.1')
-    depends_on('py-tensorflow@2.0.0:2.0.999',  when='@2.0.0')
-    depends_on('py-tensorflow@1.13.1', when='@1.13.0')
-
-    depends_on('py-absl-py@0.7.0:', type=('build', 'run'), when='@1.12.1,1.14:')
-    depends_on('py-numpy@1.16.0:1.18',  type=('build', 'run'), when='@1.13.2,1.15:')
-    depends_on('py-six@1.12.0:', type=('build', 'run'), when='@2.1:')
-    depends_on('py-keras-preprocessing@1.1.1:1.999', type=('build', 'run'), when='@2.3:')
+    depends_on('py-tensorflow@2.4.0:2.4.999', type=('build', 'run'), when='@2.4.0')
+    depends_on('py-tensorflow@2.3.0:2.3.999', type=('build', 'run'), when='@2.3.0')
+    depends_on('py-tensorflow@2.2.0:2.2.999', type=('build', 'run'), when='@2.2.0')
+    depends_on('py-tensorflow@2.1.0:2.1.999', type=('build', 'run'), when='@2.1')
+    depends_on('py-tensorflow@2.0.0:2.0.999', type=('build', 'run'), when='@2.0.0')
+    depends_on('py-tensorflow@1.13.1', type=('build', 'run'), when='@1.13.0')
 
     depends_on('bazel@0.19.0:', type='build')
     depends_on('py-funcsigs@1.0.2:', type=('build', 'run'))
 
     def install(self, spec, prefix):
-        tmp_path = join_path(env.get('SPACK_TMPDIR', '/tmp/spack'),
-                             'tf-estimator',
-                             self.module.site_packages_dir[1:])
-        mkdirp(tmp_path)
-        env['TEST_TMPDIR'] = tmp_path
-        env['HOME'] = tmp_path
+        self.tmp_path = tempfile.mkdtemp(dir='/tmp', prefix='spack')
+        env['TEST_TMPDIR'] = self.tmp_path
+        env['HOME'] = self.tmp_path
 
         args = [
             # Don't allow user or system .bazelrc to override build settings
             '--nohome_rc',
             '--nosystem_rc',
             # Bazel does not work properly on NFS, switch to /tmp
-            '--output_user_root=' + tmp_path,
+            '--output_user_root=' + self.tmp_path,
             'build',
             # Spack logs don't handle colored output well
             '--color=no',
@@ -59,6 +54,7 @@ class PyTensorflowEstimator(Package):
             '--verbose_failures',
             # Show (formatted) subcommands being executed
             '--subcommands=pretty_print',
+            '--spawn_strategy=local',
             # Ask bazel to explain what it's up to
             # Needs a filename as argument
             '--explain=explainlogfile.txt',
@@ -79,3 +75,4 @@ class PyTensorflowEstimator(Package):
         with working_dir(buildpath):
             setup_py('install', '--prefix={0}'.format(prefix),
                      '--single-version-externally-managed', '--root=/')
+        remove_linked_tree(self.tmp_path)