From fa7189b480d48407bbfafbbf67b1910430a4dc54 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Tue, 23 Nov 2021 18:06:17 +0100 Subject: 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 --- bin/spack | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'bin') 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) -- cgit v1.2.3-70-g09d2