summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorMassimiliano Culpo <massimiliano.culpo@gmail.com>2021-11-23 18:06:17 +0100
committerGitHub <noreply@github.com>2021-11-23 09:06:17 -0800
commitfa7189b480d48407bbfafbbf67b1910430a4dc54 (patch)
tree6b3b0525740f38f091f09e3f08cf5a3460700311 /bin
parent812663de623779c6431e1256b22b6d1f94f108a4 (diff)
downloadspack-fa7189b480d48407bbfafbbf67b1910430a4dc54.tar.gz
spack-fa7189b480d48407bbfafbbf67b1910430a4dc54.tar.bz2
spack-fa7189b480d48407bbfafbbf67b1910430a4dc54.tar.xz
spack-fa7189b480d48407bbfafbbf67b1910430a4dc54.zip
Remove support for Python 2.6 (#27256)
Modifications: - [x] Removed `centos:6` unit test, adjusted vermin checks - [x] Removed backport of `collections.OrderedDict` - [x] Removed backport of `functools.total_ordering` - [x] Removed Python 2.6 specific skip markers in unit tests - [x] Fixed a few minor Python 2.6 related TODOs in code Updating the vendored dependencies will be done in separate PRs
Diffstat (limited to 'bin')
-rwxr-xr-xbin/spack6
1 files changed, 2 insertions, 4 deletions
diff --git a/bin/spack b/bin/spack
index dffcbd2026..3b4f782d1c 100755
--- a/bin/spack
+++ b/bin/spack
@@ -33,11 +33,11 @@ import sys
min_python3 = (3, 5)
-if sys.version_info[:2] < (2, 6) or (
+if sys.version_info[:2] < (2, 7) or (
sys.version_info[:2] >= (3, 0) and sys.version_info[:2] < min_python3
):
v_info = sys.version_info[:3]
- msg = "Spack requires Python 2.6, 2.7 or %d.%d or higher " % min_python3
+ msg = "Spack requires Python 2.7 or %d.%d or higher " % min_python3
msg += "You are running spack with Python %d.%d.%d." % v_info
sys.exit(msg)
@@ -54,8 +54,6 @@ spack_external_libs = os.path.join(spack_lib_path, "external")
if sys.version_info[:2] <= (2, 7):
sys.path.insert(0, os.path.join(spack_external_libs, "py2"))
-if sys.version_info[:2] == (2, 6):
- sys.path.insert(0, os.path.join(spack_external_libs, "py26"))
sys.path.insert(0, spack_external_libs)