diff options
Diffstat (limited to 'var')
5 files changed, 10 insertions, 20 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 * diff --git a/var/spack/repos/builtin/packages/dataspaces/package.py b/var/spack/repos/builtin/packages/dataspaces/package.py index 91368a2c15..d19e0f30d8 100644 --- a/var/spack/repos/builtin/packages/dataspaces/package.py +++ b/var/spack/repos/builtin/packages/dataspaces/package.py @@ -2,16 +2,13 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) - -import six - from spack.package import * def is_string(x): """validate a string""" try: - return isinstance(x, six.string_types) + return isinstance(x, str) except ValueError: return False diff --git a/var/spack/repos/builtin/packages/pythia6/package.py b/var/spack/repos/builtin/packages/pythia6/package.py index 435e86f01c..497f926673 100644 --- a/var/spack/repos/builtin/packages/pythia6/package.py +++ b/var/spack/repos/builtin/packages/pythia6/package.py @@ -2,12 +2,9 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) - import numbers import os - -from six import iteritems -from six.moves.urllib.parse import urlparse +import urllib.parse from spack.package import * @@ -97,7 +94,7 @@ class Pythia6(CMakePackage): "ttbar.lhe": "db772b69ab4e0300d973b57414523ac8e7fa8535eac49ee52a6b69b1c131983d", } - for example, checksum in iteritems(examples): + for example, checksum in examples.items(): resource( name=example, url="http://pythiasix.hepforge.org/examples/{0}".format(example), @@ -114,8 +111,8 @@ class Pythia6(CMakePackage): "https://pythiasix.hepforge.org/pythia6-announcement.txt": "2a52def41f0c93e32e0db58dbcf072b987ebfbd32e42ccfc1f9382fcf65f1271", } - for docurl, checksum in iteritems(docs): - doc = os.path.basename(urlparse(docurl).path) + for docurl, checksum in docs.items(): + doc = os.path.basename(urllib.parse.urlparse(docurl).path) resource( name=doc, url=docurl, diff --git a/var/spack/repos/builtin/packages/rust/package.py b/var/spack/repos/builtin/packages/rust/package.py index 2fa16ff3bc..aec30c1118 100644 --- a/var/spack/repos/builtin/packages/rust/package.py +++ b/var/spack/repos/builtin/packages/rust/package.py @@ -5,8 +5,6 @@ import re -from six import iteritems - from spack.package import * @@ -197,7 +195,7 @@ class Rust(Package): rust_prerelease_versions = ["beta", "nightly", "master"] for prerelease_version in rust_prerelease_versions: - for rust_target, rust_arch_list in iteritems(rust_archs): + for rust_target, rust_arch_list in rust_archs.items(): for rust_arch in rust_arch_list: # All pre-release builds are built with the latest beta # compiler. @@ -226,8 +224,8 @@ class Rust(Package): # _host_ architecture, not the target architecture, in order to support # cross compiling. I'm not sure Spack provides a way to specify a # distinction in the when clause, though. - for rust_version, rust_targets in iteritems(rust_releases): - for rust_target, rust_sha256 in iteritems(rust_targets): + for rust_version, rust_targets in rust_releases.items(): + for rust_target, rust_sha256 in rust_targets.items(): for rust_arch in rust_archs[rust_target]: resource( name="rust-{version}-{target}".format( |