Merge pull request #2922 from MetRonnie/python

Bump min python to 3.12

Author: oliver-sanders

.github/workflows/build.yml

@@ -32,10 +32,10 @@ jobs:
       fail-fast: false
       matrix:
         os: ['ubuntu-latest', 'macos-latest']
-        python: ['3.7', '3.8', '3.9', '3']
+        python: ['3.12', '3']
         exclude:
           - os: 'macos-latest'
-            python: '3.7'
+            python: '3.12'
     steps:
       - name: Checkout
         uses: actions/checkout@v4

.github/workflows/test-conda-builds.yml

@@ -27,7 +27,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.8', '3']
+        python-version: ['3.12', '3']
     env:
       ENV_FILE: conda-environment.yml
     steps:

.github/workflows/test.yml

@@ -48,7 +48,7 @@ jobs:
   lint:
     strategy:
       matrix:
-        python-version: ['3.9']
+        python-version: ['3.12']
     runs-on: ubuntu-latest
     timeout-minutes: 3
     steps:
@@ -96,10 +96,10 @@ jobs:
       fail-fast: false
       matrix:
         os: ['ubuntu-latest']
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3']
+        python-version: ['3.12', '3']
         include:
           - os: 'macos-latest'
-            python-version: '3.8'  # oldest arm64 build on conda-forge
+            python-version: '3.12'
 
     steps:
       - name: Checkout
@@ -233,7 +233,7 @@ jobs:
     timeout-minutes: 5
     strategy:
       matrix:
-        python-version: ['3.9']
+        python-version: ['3']
     steps:
       - name: Checkout
         uses: actions/checkout@v4

.github/workflows/test_rsync_test_script.yml

@@ -22,8 +22,8 @@ jobs:
         os: ['ubuntu-latest']
         python-version: [
           '2.7',
-          '3.5', '3.6',
-          '3.7', '3.8', '3.9', '3.12'
+          '3.5', '3.6', '3.7', '3.8', '3.9',
+          '3.12', '3'
         ]
 
     steps:

changes.d/2922.break.md

@@ -0,0 +1 @@
+Dropped support for Python 3.7-3.11. The minimum supported version is now 3.12.

conda-environment.yml

@@ -4,7 +4,7 @@ channels:
 dependencies:
   # outut: metomi-rose-base
   - __unix
-  - python >= 3.7.0
+  - python >= 3.12.0
   - aiofiles
   - jinja2 >=2.10.1
   - keyring >=23
@@ -13,8 +13,6 @@ dependencies:
   - psutil >=5.6.0
   - requests
   - sqlalchemy >=1,<2
-  - importlib_metadata >=5.0  # py<3.12 TODO: selectors don't work for noarch packages
-  - importlib_resources >=2.0  # py<3.9 TODO: selectors don't work for noarch packages
   # - tornado (rosie disco is temporally disabled)
 
   # output: metomi-rose

metomi/rose/host_select.py

@@ -292,7 +292,7 @@ def _bash_login_cmd(cmd: List[str]) -> List[str]:
         >>> HostSelector._bash_login_cmd(["echo", "-n", "Multiple words"])
         ['bash', '-l', '-c', "echo -n 'Multiple words'"]
         """
-        return ['bash', '-l', '-c', RosePopener.shlex_join(cmd)]
+        return ['bash', '-l', '-c', shlex.join(cmd)]
 
     def select(
         self,
@@ -442,7 +442,7 @@ def select(
             if not self.is_local_host(host_name):
                 command = [
                     *self.popen.get_cmd('ssh', host_name),
-                    RosePopener.shlex_join(command)
+                    shlex.join(command)
                 ]
             # fire off host-select-client processes
             proc = self.popen.run_bg(

metomi/rose/popen.py

@@ -79,7 +79,7 @@ def __str__(self):
         if isinstance(command, str):
             ret = command
         else:
-            ret = RosePopener.shlex_join(self.command)
+            ret = shlex.join(self.command)
 
         try:
             # real file or real stream
@@ -140,25 +140,6 @@ class RosePopener:
     }
     ENVS_OF_CMDS = {"editor": ["VISUAL", "EDITOR"]}
 
-    @staticmethod
-    def shlex_join(args: Iterable[str]) -> str:
-        """Convert a list of strings into a shell command, safely quoting
-        when the strings contain whitespace and special chars.
-
-        Basically a back-port of shlex.join(), needed for py 3.7.
-
-        Examples:
-        >>> RosePopener.shlex_join([])
-        ''
-        >>> RosePopener.shlex_join(["echo", "-n", "Multiple words"])
-        "echo -n 'Multiple words'"
-        >>> RosePopener.shlex_join(["ls", "my_dir;foiled_injection"])
-        "ls 'my_dir;foiled_injection'"
-        >>> RosePopener.shlex_join(["what", "about", "globs*"])
-        "what about 'globs*'"
-        """
-        return " ".join(shlex.quote(arg) for arg in args)
-
     @staticmethod
     def list_to_shell_str(args: Iterable[str]) -> str:
         """Convert a list of strings into a shell command, escaping whitespace

metomi/rose/rose.py

@@ -61,24 +61,12 @@ def pythonpath_manip():
 )
 
 if TYPE_CHECKING:
-    try:
-        from importlib_metadata import EntryPoint
-    except ImportError:
-        from importlib.metadata import EntryPoint  # type: ignore
+    from importlib.metadata import EntryPoint
 
 
 def iter_entry_points(name: str):
     """Iterate over all entry points for a given group name"""
-    if sys.version_info[:2] >= (3, 12):
-        from importlib.metadata import entry_points
-    else:
-        # BACK_COMPAT: importlib_metadata
-        #   importlib.metadata was added in Python 3.8. The required interfaces
-        #   were completed by 3.12. For lower versions we must use the
-        #   importlib_metadata backport.
-        # FROM: Python 3.7
-        # TO: Python: 3.12
-        from importlib_metadata import entry_points
+    from importlib.metadata import entry_points
     yield from entry_points().select(group=name)
 
 

metomi/rose/run_source_vc.py

@@ -17,6 +17,7 @@
 """Write version control information of sources used in run time."""
 
 import os
+import shlex
 import sys
 
 from metomi.rose.popen import RosePopener
@@ -67,7 +68,7 @@ def write_source_vc_info(run_source_dir, output=None, popen=None):
                 if out:
                     write_safely(("#" * 80 + "\n"), handle)
                     write_safely(
-                        ("# %s\n" % popen.shlex_join(cmd)), handle
+                        ("# %s\n" % shlex.join(cmd)), handle
                     )
                     write_safely(("#" * 80 + "\n"), handle)
                     write_safely(out, handle)