diff options
author | Massimiliano Culpo <massimiliano.culpo@gmail.com> | 2023-05-02 19:28:24 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-02 13:28:24 -0400 |
commit | 68a4b2e4e46f6664980f0f96d3b9a68ba7198eb7 (patch) | |
tree | cee10dbb815a265686c0552f4da2c384ee500f0b /var/spack/repos/builtin.mock/packages | |
parent | 131e1c09379d346a468e754e06b498c6bf8394b7 (diff) | |
download | spack-68a4b2e4e46f6664980f0f96d3b9a68ba7198eb7.tar.gz spack-68a4b2e4e46f6664980f0f96d3b9a68ba7198eb7.tar.bz2 spack-68a4b2e4e46f6664980f0f96d3b9a68ba7198eb7.tar.xz spack-68a4b2e4e46f6664980f0f96d3b9a68ba7198eb7.zip |
GitHub Actions: do not install six in CI (#37361)
* GitHub Actions: do not install six in CI
* Remove workflow code that was commented out
* Remove any use of "six" from packages
Diffstat (limited to 'var/spack/repos/builtin.mock/packages')
-rw-r--r-- | var/spack/repos/builtin.mock/packages/multimethod/package.py | 4 | ||||
-rw-r--r-- | var/spack/repos/builtin.mock/packages/raiser/package.py | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/var/spack/repos/builtin.mock/packages/multimethod/package.py b/var/spack/repos/builtin.mock/packages/multimethod/package.py index d28b44c7fd..2853b87284 100644 --- a/var/spack/repos/builtin.mock/packages/multimethod/package.py +++ b/var/spack/repos/builtin.mock/packages/multimethod/package.py @@ -3,8 +3,6 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from six import string_types - import spack.platforms from spack.package import * from spack.pkg.builtin.mock.multimethod_base import MultimethodBase @@ -102,7 +100,7 @@ class Multimethod(MultimethodBase): @when("target=" + target.name) def different_by_target(self): - if isinstance(self.spec.architecture.target, string_types): + if isinstance(self.spec.architecture.target, str): return self.spec.architecture.target else: return self.spec.architecture.target.name diff --git a/var/spack/repos/builtin.mock/packages/raiser/package.py b/var/spack/repos/builtin.mock/packages/raiser/package.py index b80f0a579a..b9e68fa11d 100644 --- a/var/spack/repos/builtin.mock/packages/raiser/package.py +++ b/var/spack/repos/builtin.mock/packages/raiser/package.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from six.moves import builtins +import builtins from spack.package import * |