remove support for Python 2.7 and 3.5

.github/workflows/bootstrap_script.yml

@@ -26,7 +26,7 @@ jobs:
     strategy:
       matrix:
         # Don't run for Python 3.8, 3.9 , people should just use `pip install easybuild`
-        python: [2.7, 3.6, 3.7]
+        python: [3.6, 3.7]
         modules_tool:
           # use variables defined by 'setup' job above, see also
           # https://docs.github.com/en/actions/reference/context-and-expression-syntax-for-github-actions#needs-context
@@ -36,21 +36,12 @@ jobs:
         lc_all: [""]
         include:
           # also test with module tools other than Lmod (only Tcl syntax)
-          - modules_tool: ${{needs.setup.outputs.modulesTcl}}
-            module_syntax: Tcl
-            python: 2.7
           - modules_tool: ${{needs.setup.outputs.modulesTcl}}
             module_syntax: Tcl
             python: 3.6
-          - modules_tool: ${{needs.setup.outputs.modules3}}
-            module_syntax: Tcl
-            python: 2.7
           - modules_tool: ${{needs.setup.outputs.modules3}}
             module_syntax: Tcl
             python: 3.6
-          - modules_tool: ${{needs.setup.outputs.modules4}}
-            module_syntax: Tcl
-            python: 2.7
           - modules_tool: ${{needs.setup.outputs.modules4}}
             module_syntax: Tcl
             python: 3.6

.github/workflows/container_tests.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-18.04
     strategy:
       matrix:
-        python: [2.7, 3.6]
+        python: [3.6]
       fail-fast: false
     steps:
     - uses: actions/checkout@v3

.github/workflows/eb_command.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        python: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, '3.10', '3.11']
+        python: [3.6, 3.7, 3.8, 3.9, '3.10', '3.11']
       fail-fast: false
     steps:
     - uses: actions/checkout@v3

.github/workflows/linting.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, '3.10', '3.11']
+        python-version: [3.6, 3.7, 3.8, 3.9, '3.10', '3.11']
 
     steps:
     - uses: actions/checkout@v3
@@ -30,10 +30,4 @@ jobs:
 
     - name: Run flake8 to verify PEP8-compliance of Python code
       run: |
-        # don't check py2vs3/py3.py when testing with Python 2, and vice versa
-        if [[ "${{ matrix.python-version }}" =~ "2." ]]; then
-            py_excl=py3
-        else
-            py_excl=py2
-        fi
-        flake8 --exclude ./easybuild/tools/py2vs3/${py_excl}.py
+        flake8

.github/workflows/unit_tests.yml

@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        python: [2.7, 3.6]
+        python: [3.6]
         modules_tool:
           # use variables defined by 'setup' job above, see also
           # https://docs.github.com/en/actions/reference/context-and-expression-syntax-for-github-actions#needs-context
@@ -46,9 +46,6 @@ jobs:
             module_syntax: Lua
         include:
           # Test different Python 3 versions with Lmod 8.x (with both Lua and Tcl module syntax)
-          - python: 3.5
-            modules_tool: ${{needs.setup.outputs.lmod8}}
-            module_syntax: Lua
           - python: 3.7
             modules_tool: ${{needs.setup.outputs.lmod8}}
             module_syntax: Lua
@@ -205,10 +202,6 @@ jobs:
           # create file owned by root but writable by anyone (used by test_copy_file)
           sudo touch /tmp/file_to_overwrite_for_easybuild_test_copy_file.txt
           sudo chmod o+w /tmp/file_to_overwrite_for_easybuild_test_copy_file.txt
-          # silence deprecation warning when using Python 2, since it breaks a bunch of tests
-          if [ "${{matrix.python}}" == '2.7' ]; then
-            export TEST_EASYBUILD_SILENCE_DEPRECATION_WARNINGS=python2
-          fi
           # run test suite
           python -O -m test.framework.suite 2>&1 | tee test_framework_suite.log
           # try and make sure output of running tests is clean (no printed messages/warnings)

easybuild/main.py

@@ -77,7 +77,6 @@
 from easybuild.tools.robot import check_conflicts, dry_run, missing_deps, resolve_dependencies, search_easyconfigs
 from easybuild.tools.package.utilities import check_pkg_support
 from easybuild.tools.parallelbuild import submit_jobs
-from easybuild.tools.py2vs3 import python2_is_deprecated
 from easybuild.tools.repository.repository import init_repository
 from easybuild.tools.systemtools import check_easybuild_deps
 from easybuild.tools.testing import create_test_report, overall_test_report, regtest, session_state
@@ -603,9 +602,6 @@ def main(args=None, logfile=None, do_build=None, testing=False, modtool=None):
     eb_go, cfg_settings = set_up_configuration(args=args, logfile=logfile, testing=testing)
     options, orig_paths = eb_go.options, eb_go.args
 
-    if 'python2' not in build_option('silence_deprecation_warnings'):
-        python2_is_deprecated()
-
     global _log
     (build_specs, _log, logfile, robot_path, search_query, eb_tmpdir, try_to_generate,
      from_pr_list, tweaked_ecs_paths) = cfg_settings

easybuild/tools/py2vs3/__init__.py

@@ -22,40 +22,13 @@
 # You should have received a copy of the GNU General Public License
 # along with EasyBuild.  If not, see <http://www.gnu.org/licenses/>.
 #
-import sys
 
-# all functionality provided by the py2 and py3 modules is made available via the easybuild.tools.py2vs3 namespace
-if sys.version_info[0] >= 3:
-    from easybuild.tools.py2vs3.py3 import *  # noqa
-else:
-    from easybuild.tools.py2vs3.py2 import *  # noqa
+# all functionality provided by the py3 modules is made available via the easybuild.tools.py2vs3 namespace
+from easybuild.tools.py2vs3.py3 import *  # noqa
 
 
 # based on six's 'with_metaclass' function
 # see also https://stackoverflow.com/questions/18513821/python-metaclass-understanding-the-with-metaclass
 def create_base_metaclass(base_class_name, metaclass, *bases):
     """Create new class with specified metaclass based on specified base class(es)."""
     return metaclass(base_class_name, bases, {})
-
-
-def python2_is_deprecated():
-    """
-    Print warning when using Python 2, since the support for running EasyBuild with it is deprecated.
-    """
-    if sys.version_info[0] == 2:
-        full_py_ver = '.'.join(str(x) for x in sys.version_info[:3])
-        warning_lines = [
-            "Running EasyBuild with Python v2.x is deprecated, found Python v%s." % full_py_ver,
-            "Support for running EasyBuild with Python v2.x will be removed in EasyBuild v5.0.",
-            '',
-            "It is strongly recommended to start using Python v3.x for running EasyBuild,",
-            "see https://docs.easybuild.io/en/latest/Python-2-3-compatibility.html for more information.",
-        ]
-        max_len = max(len(x) for x in warning_lines)
-        for i in range(len(warning_lines)):
-            line_len = len(warning_lines[i])
-            warning_lines[i] = '!!! ' + warning_lines[i] + ' ' * (max_len - line_len) + ' !!!'
-        max_len = max(len(x) for x in warning_lines)
-        warning_lines.insert(0, '!' * max_len)
-        warning_lines.append('!' * max_len)
-        sys.stderr.write('\n\n' + '\n'.join(warning_lines) + '\n\n\n')

eb

@@ -32,6 +32,7 @@
 # @author: Kenneth Hoste (Ghent University)
 # @author: Pieter De Baets (Ghent University)
 # @author: Jens Timmerman (Ghent University)
+# @author: Simon Branford (University of Birmingham)
 
 keyboard_interrupt() {
     echo "Keyboard interrupt!"
@@ -40,9 +41,8 @@ keyboard_interrupt() {
 
 trap keyboard_interrupt SIGINT
 
-# Python 2.6+ or 3.5+ required
-REQ_MIN_PY2VER=6
-REQ_MIN_PY3VER=5
+# Python 3.6+ required
+REQ_MIN_PY3VER=6
 
 EASYBUILD_MAIN='easybuild.main'
 
@@ -60,7 +60,7 @@ PYTHON=
 # - EB_INSTALLPYTHON is set when EasyBuild is installed as a module (by EasyBuild). It is set to the PYTHON
 #   used during that installation (for example, you could override PYTHON using EB_PYTHON at installation
 #   time, this variable preserves that choice).
-for python_cmd in "${EB_PYTHON}" "${EB_INSTALLPYTHON}" 'python' 'python3' 'python2'; do
+for python_cmd in "${EB_PYTHON}" "${EB_INSTALLPYTHON}" 'python' 'python3'; do
 
     # Only consider non-empty values, i.e. continue if e.g. $EB_PYTHON is not set
     [ -n "${python_cmd}" ] || continue
@@ -76,10 +76,7 @@ for python_cmd in "${EB_PYTHON}" "${EB_INSTALLPYTHON}" 'python' 'python3' 'pytho
         pyver_maj=$(echo "${pyver}" | cut -f1 -d'.')
         pyver_min=$(echo "${pyver}" | cut -f2 -d'.')
 
-        if [ "${pyver_maj}" -eq 2 ] && [ "${pyver_min}" -ge "${REQ_MIN_PY2VER}" ]; then
-            verbose "'${python_cmd}' version: ${pyver}, which matches Python 2 version requirement (>= 2.${REQ_MIN_PY2VER})"
-            PYTHON="${python_cmd}"
-        elif [ "${pyver_maj}" -eq 3 ] && [ "${pyver_min}" -ge "${REQ_MIN_PY3VER}" ]; then
+        if [ "${pyver_maj}" -eq 3 ] && [ "${pyver_min}" -ge "${REQ_MIN_PY3VER}" ]; then
             verbose "'${python_cmd}' version: ${pyver}, which matches Python 3 version requirement (>= 3.${REQ_MIN_PY3VER})"
             PYTHON="${python_cmd}"
         fi
@@ -106,7 +103,7 @@ done
 
 if [ -z "${PYTHON}" ]; then
     echo -n "ERROR: No compatible 'python' command found via \$PATH " >&2
-    echo "(EasyBuild requires Python 2.${REQ_MIN_PY2VER}+ or 3.${REQ_MIN_PY3VER}+)" >&2
+    echo "(EasyBuild requires Python 3.${REQ_MIN_PY3VER}+)" >&2
     exit 1
 else
     verbose "Selected Python command: ${python_cmd} ($(command -v "${python_cmd}"))"

requirements.txt

@@ -4,13 +4,11 @@ keyring
 keyrings.alt
 
 # GitPython 3.1.15 deprecates Python 3.5
-GitPython==3.1.14; python_version >= '3.0' and python_version < '3.6'
-GitPython; python_version >= '3.6' or python_version <= '3.0'
+GitPython==3.1.14; python_version < '3.6'
+GitPython; python_version >= '3.6'
 
 # autopep8
-# stick to older autopep8 with Python 2.7, since autopep8 1.7.0 requires pycodestyle>=2.9.1 (which is Python 3 only)
-autopep8<1.7.0; python_version < '3.0'
-autopep8; python_version >= '3.0'
+autopep8
 
 # PyYAML
 PyYAML
@@ -20,18 +18,13 @@ PyYAML
 # flake8 is a superset of pycodestyle
 flake8
 
-# 2.6.7 uses invalid Python 2 syntax
-GC3Pie!=2.6.7; python_version < '3.0'
-GC3Pie; python_version >= '3.0' and python_version < '3.11'
+GC3Pie; python_version < '3.11'
 python-graph-dot
 python-hglib
 requests
 
 archspec
 
-# cryptography 3.4.0 no longer supports Python 2.7
-cryptography==3.3.2; python_version == '2.7'
 cryptography; python_version >= '3.5' and python_version < '3.11'
 
-# rich is only supported for Python 3.6+
 rich; python_version >= '3.6'

setup.py

@@ -111,8 +111,6 @@ def find_rel_test():
         "Intended Audience :: System Administrators",
         "License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
         "Operating System :: POSIX :: Linux",
-        "Programming Language :: Python :: 2.7",
-        "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",