From: Zack Cerza <zack@redhat.com>
Date: Thu, 9 May 2024 21:24:29 +0000 (-0600)
Subject: Bump minimum Python version to 3.10
X-Git-Tag: 1.2.0~45^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6e293806c1937e9da612ae20ee24ee89ddebfab2;p=teuthology.git

Bump minimum Python version to 3.10

Signed-off-by: Zack Cerza <zack@redhat.com>
---

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5bb1d31b9..69bc064af 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,13 +14,16 @@ jobs:
       matrix:
         include:
           - os: ubuntu-20.04
-            python: 3.8
-          - os: ubuntu-20.04
-            python: 3.9
+            python: "3.10"
           - os: ubuntu-22.04
             python: "3.10"
+          - os: ubuntu-22.04
+            python: "3.11"
     steps:
       - uses: actions/checkout@v2
+      - name: Add deadsnakes PPA
+        if: matrix.os == 'ubuntu-20.04'
+        run: sudo add-apt-repository --yes ppa:deadsnakes/ppa
       - name: Setup Python
         uses: actions/setup-python@v2
         with:
diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml
index a25c2cefe..e07d20e51 100644
--- a/.github/workflows/dependencies.yml
+++ b/.github/workflows/dependencies.yml
@@ -14,12 +14,15 @@ jobs:
       matrix:
         include:
           - os: ubuntu-20.04
-            python: 3.8
-          - os: ubuntu-20.04
-            python: 3.9
+            python: "3.10"
           - os: ubuntu-22.04
             python: "3.10"
+          - os: ubuntu-22.04
+            python: "3.11"
     steps:
+      - name: Add deadsnakes PPA
+        if: matrix.os == 'ubuntu-20.04'
+        run: sudo add-apt-repository --yes ppa:deadsnakes/ppa
       - name: Set up Python
         uses: actions/setup-python@v3
         with:
diff --git a/.readthedocs.yml b/.readthedocs.yml
index eab05b3e1..56ef6eb48 100644
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -7,7 +7,7 @@ formats: []
 build:
   os: ubuntu-22.04
   tools:
-    python: "3.8"
+    python: "3.10"
 python:
   install:
     - method: pip
diff --git a/bootstrap b/bootstrap
index 534288999..53c56f876 100755
--- a/bootstrap
+++ b/bootstrap
@@ -16,11 +16,9 @@ if [[ "$PYTHON" =~ "python2" ]]; then
     exit 1
 fi
 
-# This dance is to keep us from using 3.6, even on systems where it is the OS's
-# preferred version. Can be dropped when no teuthology lab in production requires
-# an older version.
+# Use the newest version we find
 if [ -z "$PYTHON" ]; then
-  for i in 10 9 8 7; do
+  for i in 12 11 10; do
     command -v "python3.$i" && PYTHON="python3.$i" && break
   done
   # This would be bizarre, but I suppose possible
diff --git a/docs/requirements.txt b/docs/requirements.txt
index c2b295e9f..eff1d8a50 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,3 +1,3 @@
-sphinx == 4.4.0
+sphinx >= 5.0.0  # for python 3.10
 sphinxcontrib-programoutput
 mock == 2.0.0
diff --git a/setup.cfg b/setup.cfg
index be35d5ebd..c9848a69c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -12,10 +12,9 @@ classifiers =
     Operating System :: POSIX :: Linux
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3 :: Only
-    Programming Language :: Python :: 3.7
-    Programming Language :: Python :: 3.8
-    Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
+    Programming Language :: Python :: 3.11
+    Programming Language :: Python :: 3.12
     Programming Language :: Python :: Implementation :: CPython
     Topic :: Software Development :: Quality Assurance
     Topic :: Software Development :: Testing
@@ -27,7 +26,7 @@ keywords = teuthology, test, ceph, cluster
 summary = Ceph test framework
 
 [options]
-python_requires = >=3.8
+python_requires = >=3.10
 packages = find:
 install_requires =
     PyYAML
diff --git a/systemd/teuthology-dispatcher@.service b/systemd/teuthology-dispatcher@.service
index 7326816f5..43a1ec1db 100644
--- a/systemd/teuthology-dispatcher@.service
+++ b/systemd/teuthology-dispatcher@.service
@@ -7,7 +7,7 @@ After=ceph.target
 [Service]
 Type=simple
 User=teuthworker
-ExecStart=/home/teuthworker/src/git.ceph.com_git_teuthology_main/virtualenv/bin/python3.8 \
+ExecStart=/home/teuthworker/src/git.ceph.com_git_teuthology_main/virtualenv/bin/python3 \
     /home/teuthworker/src/git.ceph.com_git_teuthology_main/virtualenv/bin/teuthology-dispatcher \
     -v \
     --archive-dir /home/teuthworker/archive \