Upgrade Tron to Python 3.10

Author: EmanElsaban

.github/workflows/ci.yml

@@ -15,12 +15,12 @@ jobs:
       fail-fast: false
       matrix:
         toxenv:
-          - py38,docs
+          - py310,docs
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
         with:
-          python-version: 3.8
+          python-version: 3.10
       # GHA won't setup tox for us
       - run: pip install tox==3.2
         # there are no pre-built wheels for bsddb3, so we need to install
@@ -44,7 +44,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
         with:
-          python-version: 3.8
+          python-version: 3.10
       # Update package lists to ensure we have the latest information
       - run: sudo apt-get update
       # the container provided by GitHub doesn't include utilities

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 ---
 default_language_version:
-    python: python3.8
+    python: python3.10
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v2.5.0
@@ -27,10 +27,10 @@ repos:
       - id: reorder-python-imports
         args: [--py3-plus]
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.3.1
+    rev: v3.20.0
     hooks:
       - id: pyupgrade
-        args: [--py38-plus]
+        args: [--py39-plus]
   - repo: local
     hooks:
       - id: patch-enforce-autospec
@@ -44,4 +44,4 @@ repos:
     rev: 22.3.0
     hooks:
       - id: black
-        args: [--target-version, py38]
+        args: [--target-version, py310]

.readthedocs.yaml

@@ -8,7 +8,7 @@ version: 2
 build:
   os: ubuntu-22.04
   tools:
-    python: "3.8"
+    python: "3.10"
     # You can also specify other tool versions:
     # nodejs: "20"
     # rust: "1.70"

Makefile

@@ -60,10 +60,10 @@ coffee_%: docker_%
 	'
 
 test:
-	tox -e py38
+	tox -e py310
 
 test_in_docker_%: docker_%
-	$(DOCKER_RUN) tron-builder-$* python3.8 -m tox -vv -e py38
+	$(DOCKER_RUN) tron-builder-$* python3.10 -m tox -vv -e py310
 
 tox_%:
 	tox -e $*
@@ -78,13 +78,13 @@ itest_%: debitest_%
 	@echo "itest $* OK"
 
 dev:
-	SSH_AUTH_SOCK=$(SSH_AUTH_SOCK) .tox/py38/bin/trond --debug --working-dir=dev -l logging.conf --host=0.0.0.0
+	SSH_AUTH_SOCK=$(SSH_AUTH_SOCK) .tox/py310/bin/trond --debug --working-dir=dev -l logging.conf --host=0.0.0.0
 
 example_cluster:
 	tox -e example-cluster
 
 yelpy:
-	.tox/py38/bin/pip install -r yelp_package/extra_requirements_yelp.txt
+	.tox/py310/bin/pip install -r yelp_package/extra_requirements_yelp.txt
 
 
 # 1. Bump version at the top of this file

bin/tronctl

@@ -11,12 +11,9 @@ import logging
 import pprint
 import sys
 from collections import defaultdict
+from collections.abc import Callable
+from collections.abc import Generator
 from typing import Any
-from typing import Callable
-from typing import Dict
-from typing import Generator
-from typing import Optional
-from typing import Tuple
 from urllib.parse import urljoin
 
 import argcomplete  # type: ignore
@@ -238,7 +235,7 @@ def parse_cli():
     return args
 
 
-def request(url: str, data: Dict[str, Any], headers=None, method=None) -> bool:
+def request(url: str, data: dict[str, Any], headers=None, method=None) -> bool:
     # We want every tronctl request to be attributable
     response = client.request(url, data=data, headers=headers, method=method, user_attribution=True)
     if response.error:
@@ -264,7 +261,7 @@ def event_discard(args):
         )
 
 
-def _get_triggers_for_action(server: str, action_identifier: str) -> Optional[Tuple[str, ...]]:
+def _get_triggers_for_action(server: str, action_identifier: str) -> tuple[str, ...] | None:
     try:
         namespace, job_name, run_number, action_name = action_identifier.split(".")
     except ValueError:
@@ -452,7 +449,7 @@ def tron_version(args):
     yield True
 
 
-COMMANDS: Dict[str, Callable[[argparse.Namespace], Generator[bool, None, None]]] = defaultdict(
+COMMANDS: dict[str, Callable[[argparse.Namespace], Generator[bool, None, None]]] = defaultdict(
     lambda: control_objects,
     publish=event_publish,
     discard=event_discard,

contrib/mock_patch_checker.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.8
+#!/usr/bin/env python3.10
 import ast
 import sys
 

contrib/patch-config-loggers.diff

@@ -1,5 +1,5 @@
---- a/debian/tron/opt/venvs/tron/lib/python3.8/site-packages/kubernetes/client/configuration.py
-+++ b/debian/tron/opt/venvs/tron/lib/python3.8/site-packages/kubernetes/client/configuration.py
+--- a/debian/tron/opt/venvs/tron/lib/python3.10/site-packages/kubernetes/client/configuration.py
++++ b/debian/tron/opt/venvs/tron/lib/python3.10/site-packages/kubernetes/client/configuration.py
 @@ -71,11 +71,11 @@
      """
 

debian/control

@@ -2,13 +2,13 @@ Source: tron
 Section: admin
 Priority: optional
 Maintainer: Daniel Nephin <[email protected]>
-Build-Depends: debhelper (>= 7), python3.8-dev, libdb5.3-dev, libyaml-dev, libssl-dev, libffi-dev, dh-virtualenv
+Build-Depends: debhelper (>= 7), python3.10-dev, libdb5.3-dev, libyaml-dev, libssl-dev, libffi-dev, dh-virtualenv
 Standards-Version: 3.8.3
 
 Package: tron
 Architecture: all
 Homepage: http://github.com/yelp/Tron
-Depends: bsdutils, python3.8, libdb5.3, libyaml-0-2, ${shlibs:Depends}, ${misc:Depends}
+Depends: bsdutils, python3.10, libdb5.3, libyaml-0-2, ${shlibs:Depends}, ${misc:Depends}
 Description: Tron is a job scheduling, running and monitoring package.
   Designed to replace Cron for complex scheduling and dependencies.
   Provides:

debian/rules

@@ -22,11 +22,11 @@ override_dh_virtualenv:
 	dh_virtualenv --index-url $(PIP_INDEX_URL) \
 	            --extra-pip-arg  --trusted-host=169.254.255.254 \
 	            --extra-pip-arg  --only-binary=cryptography \
-                --python=/usr/bin/python3.8 \
+                --python=/usr/bin/python3.10 \
                 --preinstall cython==0.29.36 \
                 --preinstall pip==24.3.1 \
                 --preinstall setuptools==65.5.1
 	@echo patching k8s client lib for configuration class
-	patch debian/tron/opt/venvs/tron/lib/python3.8/site-packages/kubernetes/client/configuration.py contrib/patch-config-loggers.diff
+	patch debian/tron/opt/venvs/tron/lib/python3.10/site-packages/kubernetes/client/configuration.py contrib/patch-config-loggers.diff
 override_dh_installinit:
 	dh_installinit --noscripts

dev/config/MASTER.yaml

@@ -17,7 +17,7 @@ nodes:
 # action_runner:
 #   runner_type: "subprocess"
 #   remote_status_path: "pg/tron/status"
-#   remote_exec_path: "pg/tron/.tox/py38/bin"
+#   remote_exec_path: "pg/tron/.tox/py310/bin"
 
 jobs:
   testjob0: