deprecate Python2

replaced PYTHON_INTERPRETER with python3

Author: calccrypto

.github/workflows/check.yml

@@ -157,39 +157,6 @@ jobs:
       working-directory: ${{ github.workspace }}/build
       run:  ctest --output-on-failure
 
-  Python2:
-    needs: [ShellCheck, Pylint]
-    runs-on: ubuntu-latest
-    container:
-      image: centos:8
-    steps:
-    - uses: actions/checkout@v4
-
-    - uses: actions/cache@v4
-      with:
-        path: ${{ env.DEP_INSTALL_PREFIX }}
-        key:  ${{ runner.os }}-Python2
-
-    - name: CentOS 8 Prerequisites
-      run:  contrib/CI/centos8.sh
-
-    - name: Install Python 2
-      run:  yum -y install python2
-
-    - name: Configure CMake For Core Tests
-      run:  |
-            mkdir -p build
-            cd build
-            cmake .. ${{ env.COMMON_CONFIG }} -DPYTHON_INTERPRETER=python2
-
-    - name: Build
-      working-directory: ${{ github.workspace }}/build
-      run:  make -j
-
-    - name: Test
-      working-directory: ${{ github.workspace }}/build
-      run:  ctest --output-on-failure
-
   TestDirectory:
     needs: [ShellCheck, Pylint]
     runs-on: ubuntu-latest

CMakeLists.txt

@@ -206,27 +206,8 @@ else()
   message(STATUS "Not compiling C++ sources")
 endif()
 
-# Python is required
-if (CMAKE_VERSION VERSION_GREATER "3.12.0")
-  find_package(Python REQUIRED COMPONENTS Interpreter)
-else()
-  find_program(Python NAMES python python3 python2) # REQUIRED option was not added until 3.18
-  if (NOT Python)
-    message(FATAL_ERROR "Python not found")
-  endif()
-  execute_process(COMMAND ${Python} --version
-    OUTPUT_VARIABLE Python_VERSION_STDOUT
-    ERROR_VARIABLE Python_VERSION_STDERR
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-    ERROR_STRIP_TRAILING_WHITESPACE)
-  string(REGEX REPLACE "^Python " "" Python_VERSION "${Python_VERSION_STDOUT}${Python_VERSION_STDERR}")
-  string(REPLACE "." ";" Python_VERSION_LIST ${Python_VERSION})
-  list(GET Python_VERSION_LIST 0 Python_VERSION_MAJOR)
-  message(STATUS "Found Python: ${Python} (found version \"${Python_VERSION}\") found components: Interpreter")
-endif()
-
-set(PYTHON_INTERPRETER "python${Python_VERSION_MAJOR}" CACHE STRING "Python Interpreter")
-message(STATUS "Using Python Interpreter: ${PYTHON_INTERPRETER}")
+# Python3 is required
+find_package(Python3 REQUIRED COMPONENTS Interpreter REQUIRED)
 
 # require find_program to return executables with -r+x permissions
 if (POLICY CMP0109)
@@ -572,7 +553,7 @@ if (RPMBUILD)
   set(CPACK_RPM_PACKAGE_LICENSE "BSD/LANL")
   set(CPACK_RPM_PACKAGE_VENDOR "LANL")
   set(CPACK_RPM_PACKAGE_URL "https://github.com/mar-file-system/GUFI")
-  set(CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES}, ${PYTHON_INTERPRETER}, coreutils")
+  set(CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES}, python3-pip, coreutils")
   set(CPACK_RPM_PACKAGE_RELOCATABLE On)
   set(CPACK_RPM_PACKAGE_ARCHITECTURE "${ARCH}")
   set(CPACK_RPM_Server_FILE_NAME "gufi-server-${GUFI_VERSION}.${ARCH}.rpm")
@@ -582,7 +563,7 @@ if (RPMBUILD)
   if (CLIENT)
     set(CPACK_RPM_Client_FILE_NAME "gufi-client-${GUFI_VERSION}.${ARCH}.rpm")
     # python libraries are installed through pip, and won't be found by rpm
-    set(CPACK_RPM_Client_PACKAGE_REQUIRES "${PYTHON_INTERPRETER}, openssh, ${PYTHON_INTERPRETER}-pip")
+    set(CPACK_RPM_Client_PACKAGE_REQUIRES "python3, python3-pip, openssh")
     set(CPACK_RPM_Client_PACKAGE_SUMMARY "GUFI Client RPM")
   endif()
 

contrib/CI/rpms.sh.in

@@ -88,7 +88,7 @@ dnf install -y gufi-server-*.rpm
 dnf autoremove -y GUFI-Server
 
 # upgrade pip to get the latest Python dependencies
-@PYTHON_INTERPRETER@ -m pip install --upgrade pip
+python3 -m pip install --upgrade pip
 
 # install the client RPM
 dnf install -y gufi-client-*.rpm

contrib/gentrace.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env @PYTHON_INTERPRETER@
+#!/usr/bin/env python3
 # This file is part of GUFI, which is part of MarFS, which is released
 # under the BSD license.
 #

contrib/hashes.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env @PYTHON_INTERPRETER@
+#!/usr/bin/env python3
 # This file is part of GUFI, which is part of MarFS, which is released
 # under the BSD license.
 #

contrib/longitudinal_snapshot.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env @PYTHON_INTERPRETER@
+#!/usr/bin/env python3
 # This file is part of GUFI, which is part of MarFS, which is released
 # under the BSD license.
 #

contrib/trace_anonymizer.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env @PYTHON_INTERPRETER@
+#!/usr/bin/env python3
 # This file is part of GUFI, which is part of MarFS, which is released
 # under the BSD license.
 #

docs/latex/sections/dependencies.tex

@@ -103,7 +103,7 @@ \subsection{System Tools}
   \hline
   Make & Yes & \\
   \hline
-  Python & Yes & Python 2.7 or Python 3 \\
+  Python & Yes & Python 3+ \\
   \hline
   pip & No & Used for installing and client dependencies \\
   \hline

scripts/gufi_client

@@ -1,4 +1,4 @@
-#!/usr/bin/env @PYTHON_INTERPRETER@
+#!/usr/bin/env python3
 # This file is part of GUFI, which is part of MarFS, which is released
 # under the BSD license.
 #
@@ -64,8 +64,8 @@
 import subprocess
 import sys
 
-if (sys.version_info.major < 3) or ((sys.version_info.major == 3) and sys.version_info.minor < 3):
-    from pipes import quote as sanitize
+if (sys.version_info.major == 3) and (sys.version_info.minor < 3):
+    from pipes import quote as sanitize # pylint: disable=deprecated-module
 else:
     from shlex import quote as sanitize # new in Python 3.3
 

scripts/gufi_common.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env @PYTHON_INTERPRETER@
+#!/usr/bin/env python3
 # This file is part of GUFI, which is part of MarFS, which is released
 # under the BSD license.
 #
@@ -67,7 +67,7 @@
 import re
 import sys
 
-if (sys.version_info.major < 3) or ((sys.version_info.major == 3) and sys.version_info.minor < 3):
+if (sys.version_info.major == 3) and (sys.version_info.minor < 3):
     from pipes import quote as sanitize # pylint: disable=deprecated-module
 else:
     from shlex import quote as sanitize # new in Python 3.3

scripts/gufi_config.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env @PYTHON_INTERPRETER@
+#!/usr/bin/env python3
 # This file is part of GUFI, which is part of MarFS, which is released
 # under the BSD license.
 #

scripts/gufi_find

@@ -1,4 +1,4 @@
-#!/usr/bin/env @PYTHON_INTERPRETER@
+#!/usr/bin/env python3
 # This file is part of GUFI, which is part of MarFS, which is released
 # under the BSD license.
 #

scripts/gufi_getfattr

@@ -1,4 +1,4 @@
-#!/usr/bin/env @PYTHON_INTERPRETER@
+#!/usr/bin/env python3
 # This file is part of GUFI, which is part of MarFS, which is released
 # under the BSD license.
 #

scripts/gufi_ls

@@ -1,4 +1,4 @@
-#!/usr/bin/env @PYTHON_INTERPRETER@
+#!/usr/bin/env python3
 # This file is part of GUFI, which is part of MarFS, which is released
 # under the BSD license.
 #

scripts/gufi_stat

@@ -1,4 +1,4 @@
-#!/usr/bin/env @PYTHON_INTERPRETER@
+#!/usr/bin/env python3
 # This file is part of GUFI, which is part of MarFS, which is released
 # under the BSD license.
 #

scripts/gufi_stats

@@ -1,4 +1,4 @@
-#!/usr/bin/env @PYTHON_INTERPRETER@
+#!/usr/bin/env python3
 # This file is part of GUFI, which is part of MarFS, which is released
 # under the BSD license.
 #

scripts/querydbs

@@ -1,4 +1,4 @@
-#!/usr/bin/env @PYTHON_INTERPRETER@
+#!/usr/bin/env python3
 # This file is part of GUFI, which is part of MarFS, which is released
 # under the BSD license.
 #

test/regression/CMakeLists.txt

@@ -145,7 +145,7 @@ configure_file(gufi_tool.py.in gufi_tool.py @ONLY)
 configure_file(gufi_vt.common gufi_vt.common @ONLY)
 
 # check for SQLAlchemy and add test if found
-execute_process(COMMAND "${PYTHON_INTERPRETER}" -c "import sqlalchemy"
+execute_process(COMMAND python3 -c "import sqlalchemy"
   RESULT_VARIABLE SQLALCHEMY_RC
   OUTPUT_QUIET ERROR_QUIET)
 if (SQLALCHEMY_RC EQUAL 0)
@@ -158,7 +158,7 @@ if (SQLALCHEMY_RC EQUAL 0)
   configure_file(gufi_vt_sqlalchemy.py.in gufi_vt_sqlalchemy.py @ONLY)
 
   # check for pugsql and add test if found
-  execute_process(COMMAND "${PYTHON_INTERPRETER}" -c "import pugsql"
+  execute_process(COMMAND python3 -c "import pugsql"
     RESULT_VARIABLE PUGSQL_RC
     OUTPUT_QUIET ERROR_QUIET)
   if (PUGSQL_RC EQUAL 0)

test/regression/gufi_tool.py.in

@@ -1,4 +1,4 @@
-#!/usr/bin/env @PYTHON_INTERPRETER@
+#!/usr/bin/env python3
 # This file is part of GUFI, which is part of MarFS, which is released
 # under the BSD license.
 #
@@ -86,25 +86,18 @@ TOOLS = {
 # import a tool by path (default: the scripts directory)
 # needed for duplicate filenames or files without the .py extension
 def import_tool(tool, filename):
-    if sys.version_info.major < 3: # pylint: disable=no-else-return
-        import imp                 # pylint: disable=deprecated-module,import-outside-toplevel
-
-        return imp.load_source(tool, filename)
     # https://csatlas.com/python-import-file-module/
-    elif sys.version_info.major >= 3:
-        # pylint: disable=import-outside-toplevel
-        import importlib.machinery
-        import importlib.util
-        from pathlib import Path
-
-        # Import mymodule
-        loader = importlib.machinery.SourceFileLoader(tool, filename)
-        spec = importlib.util.spec_from_loader(tool, loader)
-        script = importlib.util.module_from_spec(spec)
-        loader.exec_module(script)
-        return script
+    # pylint: disable=import-outside-toplevel
+    import importlib.machinery
+    import importlib.util
+    from pathlib import Path
 
-    return None
+    # Import mymodule
+    loader = importlib.machinery.SourceFileLoader(tool, filename)
+    spec = importlib.util.spec_from_loader(tool, loader)
+    script = importlib.util.module_from_spec(spec)
+    loader.exec_module(script)
+    return script
 
 if __name__ == '__main__':
     parser = argparse.ArgumentParser(description='GUFI Testing Tool Selector', add_help=False)

test/regression/gufi_vt_pugsql.py.in

@@ -1,4 +1,4 @@
-#!/usr/bin/env @PYTHON_INTERPRETER@
+#!/usr/bin/env python3
 # This file is part of GUFI, which is part of MarFS, which is released
 # under the BSD license.
 #

test/regression/gufi_vt_sqlalchemy.py.in

@@ -1,4 +1,4 @@
-#!/usr/bin/env @PYTHON_INTERPRETER@
+#!/usr/bin/env python3
 # This file is part of GUFI, which is part of MarFS, which is released
 # under the BSD license.
 #

test/regression/hexlify.py.in

@@ -1,4 +1,4 @@
-#!/usr/bin/env @PYTHON_INTERPRETER@
+#!/usr/bin/env python3
 # This file is part of GUFI, which is part of MarFS, which is released
 # under the BSD license.
 #

test/regression/setup.sh.in

@@ -187,7 +187,7 @@ PWD="$(pwd)"
 
 # generate a fake config file
 # shellcheck disable=SC2046
-CONFIG="$(@PYTHON_INTERPRETER@ -c 'import gufi_tool, os; print(os.path.realpath(gufi_tool.CONFIG_PATH))')"
+CONFIG="$(python3 -c 'import gufi_tool, os; print(os.path.realpath(gufi_tool.CONFIG_PATH))')"
 (
     echo "Threads=1"
     echo "Query=${GUFI_QUERY}"

test/unit/python/test_gufi_common.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env @PYTHON_INTERPRETER@
+#!/usr/bin/env python3
 # This file is part of GUFI, which is part of MarFS, which is released
 # under the BSD license.
 #

test/unit/python/test_gufi_config.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env @PYTHON_INTERPRETER@
+#!/usr/bin/env python3
 # This file is part of GUFI, which is part of MarFS, which is released
 # under the BSD license.
 #