enable py312 client (#985)

* initial commit

* hooks

* dont be lazy with imports

* poetry

* trailing whitespace?

* poetry lock update

* imports

* config parser

docker/base_images/base_image.Dockerfile.jinja

@@ -34,7 +34,6 @@ RUN apt update && \
     add-apt-repository -y ppa:deadsnakes/ppa && \
     apt update -y && \
     apt install -y python{{python_version}} && \
-    apt install -y python{{python_version}}-distutils && \
     apt install -y python{{python_version}}-venv && \
     apt install -y python{{python_version}}-dev && \
     rm -rf /var/lib/apt/lists

pyproject.toml

@@ -50,7 +50,7 @@ psutil = ">=5.9.4"
 pydantic = ">=1.10.0"
 pytest-asyncio = "^0.23.6"
 # Note: when using chains, 3.9 will be required at runtime, but other truss functionality works with 3.8.
-python = ">=3.8,<3.12"
+python = ">=3.8,<3.13"
 python-json-logger = ">=2.0.2"
 python-on-whales = "^0.68.0"
 PyYAML = ">=6.0"

truss/remote/remote_factory.py

@@ -1,5 +1,12 @@
 import inspect
-from configparser import DEFAULTSECT, SafeConfigParser
+
+try:
+    from configparser import DEFAULTSECT
+    from configparser import SafeConfigParser as ConfigParser
+except ImportError:
+    # We need to do this for py312 and onwards.
+    from configparser import DEFAULTSECT, ConfigParser  # type: ignore
+
 from functools import partial
 from operator import is_not
 from pathlib import Path
@@ -11,13 +18,13 @@
 USER_TRUSSRC_PATH = Path("~/.trussrc").expanduser()
 
 
-def load_config() -> SafeConfigParser:
-    config = SafeConfigParser()
+def load_config() -> ConfigParser:
+    config = ConfigParser()
     config.read(USER_TRUSSRC_PATH)
     return config
 
 
-def update_config(config: SafeConfigParser):
+def update_config(config: ConfigParser):
     with open(USER_TRUSSRC_PATH, "w") as configfile:
         config.write(configfile)
 

truss/templates/control/control/helpers/truss_patch/requirement_name_identifier.py

@@ -1,12 +1,12 @@
 from typing import Dict, List
 
-import pkg_resources
-from pkg_resources.extern.packaging import requirements  # type: ignore
+from packaging import requirements  # type: ignore
 
 
 def identify_requirement_name(req: str) -> str:
     try:
-        parsed_req = pkg_resources.Requirement.parse(req)
+
+        parsed_req = requirements.Requirement(req)
         return parsed_req.name  # type: ignore
     except (requirements.InvalidRequirement, ValueError):
         # default to the whole line if we can't parse it.

truss/util/path.py

@@ -1,10 +1,9 @@
 import os
 import random
+import shutil
 import string
 import tempfile
 from contextlib import contextmanager
-from distutils.dir_util import remove_tree
-from distutils.file_util import copy_file
 from pathlib import Path
 from typing import Iterable, Iterator, List, Optional, Set, Tuple, Union
 
@@ -33,11 +32,11 @@ def copy_tree_path(src: Path, dest: Path, ignore_patterns: List[str] = []) -> No
             dest_fp.mkdir(exist_ok=True)
         else:
             dest_fp.parent.mkdir(exist_ok=True, parents=True)
-            copy_file(str(sub_path), str(dest_fp), verbose=False)
+            shutil.copy2(str(sub_path), str(dest_fp))
 
 
 def copy_file_path(src: Path, dest: Path) -> Tuple[str, str]:
-    return copy_file(str(src), str(dest), verbose=False)
+    return shutil.copy2(str(src), str(dest))
 
 
 def copy_tree_or_file(src: Path, dest: Path) -> Union[List[str], Tuple[str, str]]:
@@ -48,7 +47,7 @@ def copy_tree_or_file(src: Path, dest: Path) -> Union[List[str], Tuple[str, str]
 
 
 def remove_tree_path(target: Path) -> None:
-    return remove_tree(str(target), verbose=0)
+    return shutil.rmtree(str(target))
 
 
 def get_max_modified_time_of_dir(path: Path) -> float: