diff options
| author | Tamara Dahlgren <dahlgren1@llnl.gov> | 2021-02-19 11:05:53 -0800 |
|---|---|---|
| committer | Tamara Dahlgren <dahlgren1@llnl.gov> | 2021-02-19 11:05:53 -0800 |
| commit | d0798160cf4c3d0254fd6d3b4d9f283b64532fb3 (patch) | |
| tree | dbf9e7f535befd06f6c7e41cd60d7296041bec9d | |
| parent | 3256f018eb6f6fd5d8f8b7f8c9693389e1944ce9 (diff) | |
| download | spack-d0798160cf4c3d0254fd6d3b4d9f283b64532fb3.tar.gz spack-d0798160cf4c3d0254fd6d3b4d9f283b64532fb3.tar.bz2 spack-d0798160cf4c3d0254fd6d3b4d9f283b64532fb3.tar.xz spack-d0798160cf4c3d0254fd6d3b4d9f283b64532fb3.zip | |
Resolve (post-cherry-picking) flake8 errors
| -rw-r--r-- | lib/spack/spack/binary_distribution.py | 3 | ||||
| -rw-r--r-- | lib/spack/spack/build_environment.py | 3 | ||||
| -rw-r--r-- | lib/spack/spack/test/bindist.py | 6 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/intel-oneapi-mpi/package.py | 6 |
4 files changed, 12 insertions, 6 deletions
diff --git a/lib/spack/spack/binary_distribution.py b/lib/spack/spack/binary_distribution.py index 4390611315..00fffdfe51 100644 --- a/lib/spack/spack/binary_distribution.py +++ b/lib/spack/spack/binary_distribution.py @@ -1120,7 +1120,8 @@ def relocate_package(spec, allow_root): if old_sbang_install_path: import spack.hooks.sbang as sbang - prefix_to_prefix_text[old_sbang_install_path] = sbang.sbang_install_path() + prefix_to_prefix_text[old_sbang_install_path] = \ + sbang.sbang_install_path() prefix_to_prefix_text[old_prefix] = new_prefix prefix_to_prefix_bin[old_prefix] = new_prefix diff --git a/lib/spack/spack/build_environment.py b/lib/spack/spack/build_environment.py index 4806a11fc8..48ce594a4b 100644 --- a/lib/spack/spack/build_environment.py +++ b/lib/spack/spack/build_environment.py @@ -412,7 +412,8 @@ def set_build_environment_variables(pkg, env, dirty): # directory. Add that to the path too. env_paths = [] compiler_specific = os.path.join( - spack.paths.build_env_path, os.path.dirname(pkg.compiler.link_paths['cc'])) + spack.paths.build_env_path, + os.path.dirname(pkg.compiler.link_paths['cc'])) for item in [spack.paths.build_env_path, compiler_specific]: env_paths.append(item) ci = os.path.join(item, 'case-insensitive') diff --git a/lib/spack/spack/test/bindist.py b/lib/spack/spack/test/bindist.py index 1d07fc8483..05cfda5019 100644 --- a/lib/spack/spack/test/bindist.py +++ b/lib/spack/spack/test/bindist.py @@ -741,11 +741,13 @@ def test_update_sbang(tmpdir, install_mockery, function_mirror): {1} '''.format(sbang.sbang_shebang_line(), sspec.prefix.bin) - installed_script_style_1_path = sspec.prefix.bin.join('sbang-style-1.sh') + installed_script_style_1_path = \ + sspec.prefix.bin.join('sbang-style-1.sh') assert sbang_style_1_expected == \ open(str(installed_script_style_1_path)).read() - installed_script_style_2_path = sspec.prefix.bin.join('sbang-style-2.sh') + installed_script_style_2_path = \ + sspec.prefix.bin.join('sbang-style-2.sh') assert sbang_style_2_expected == \ open(str(installed_script_style_2_path)).read() diff --git a/var/spack/repos/builtin/packages/intel-oneapi-mpi/package.py b/var/spack/repos/builtin/packages/intel-oneapi-mpi/package.py index 1f7aef1403..78a2080951 100644 --- a/var/spack/repos/builtin/packages/intel-oneapi-mpi/package.py +++ b/var/spack/repos/builtin/packages/intel-oneapi-mpi/package.py @@ -50,8 +50,10 @@ class IntelOneapiMpi(IntelOneApiLibraryPackage): def libs(self): libs = [] for dir in ['lib/release_mt', 'lib', 'libfabric/lib']: - lib_path = '{0}/{1}/latest/{2}'.format(self.prefix, self._dir_name, dir) - ldir = find_libraries('*', root=lib_path, shared=True, recursive=False) + lib_path = '{0}/{1}/latest/{2}'.format(self.prefix, self._dir_name, + dir) + ldir = find_libraries('*', root=lib_path, shared=True, + recursive=False) libs += ldir return libs |