Merge pull request #1020 from projectsyn/deprecate-py38-39

Update minimum required Python to 3.10
projectsyn · Sep 3, 2024 · 5554398 · 5554398
2 parents d4db223 + adf2a32
commit 5554398
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 112 deletions.
diff --git a/.github/workflows/build-virtualenv-caches.yml b/.github/workflows/build-virtualenv-caches.yml
@@ -24,7 +24,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/setup-python@v5
       with:
-        python-version: '3.9'
+        python-version: '3.11'
     - uses: Gr1N/setup-poetry@v9
     - name: Install tox
       run: |
@@ -42,8 +42,6 @@ jobs:
     strategy:
       matrix:
         python-version:
-          - '3.8'
-          - '3.9'
           - '3.10'
           - '3.11'
     steps:
@@ -90,8 +88,6 @@ jobs:
     strategy:
       matrix:
         python-version:
-          - '3.8'
-          - '3.9'
           - '3.10'
           - '3.11'
     steps:
@@ -120,13 +116,13 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/setup-python@v5
       with:
-        python-version: '3.9'
+        python-version: '3.11'
     - uses: Gr1N/setup-poetry@v9
     - uses: actions/cache@v4
       with:
         path: ~/.cache/pypoetry/virtualenvs
         key: ${{ runner.os }}-poetry-${{ hashFiles('poetry.lock') }}
     - name: Install Poetry and setup Poetry virtualenv
       run: |
-        poetry env use python3.9
+        poetry env use python3.11
         poetry install
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -16,15 +16,15 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/setup-python@v5
       with:
-        python-version: '3.9'
+        python-version: '3.11'
     - uses: Gr1N/setup-poetry@v9
     - uses: actions/cache@v4
       with:
         path: ~/.cache/pypoetry/virtualenvs
         key: ${{ runner.os }}-poetry-${{ hashFiles('poetry.lock') }}
     - name: Install Poetry and setup Poetry virtualenv
       run: |
-        poetry env use python3.9
+        poetry env use python3.11
         poetry install
     - name: Install jsonnet-bundler
       run: |

diff --git a/.github/workflows/publish-pypi.yml b/.github/workflows/publish-pypi.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: '3.9'
+          python-version: '3.11'
       - uses: Gr1N/setup-poetry@v9
       - uses: actions/cache@v4
         with:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -19,7 +19,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/setup-python@v5
       with:
-        python-version: '3.9'
+        python-version: '3.11'
     - uses: Gr1N/setup-poetry@v9
     - name: Install tox
       run: |
@@ -44,8 +44,6 @@ jobs:
     strategy:
       matrix:
         python-version:
-          - '3.8'
-          - '3.9'
           - '3.10'
           - '3.11'
     steps:
@@ -105,8 +103,6 @@ jobs:
     strategy:
       matrix:
         python-version:
-          - '3.8'
-          - '3.9'
           - '3.10'
           - '3.11'
     steps:
@@ -143,15 +139,15 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/setup-python@v5
       with:
-        python-version: '3.9'
+        python-version: '3.11'
     - uses: Gr1N/setup-poetry@v9
     - uses: actions/cache@v4
       with:
         path: ~/.cache/pypoetry/virtualenvs
         key: ${{ runner.os }}-poetry-${{ hashFiles('poetry.lock') }}
     - name: Install Poetry, setup Poetry virtualenv, and build Kapitan helm bindings
       run: |
-        poetry env use python3.9
+        poetry env use python3.11
         poetry install
     - name: Install jsonnet-bundler
       run: |

diff --git a/README.md b/README.md
@@ -29,7 +29,7 @@ Commodore also supports additional processing on the output of Kapitan, such as
 
 ## System Requirements
 
-* Python 3.8 - 3.11 with `python3-dev` and `python3-venv` updated
+* Python 3.10 - 3.11 with `python3-dev` and `python3-venv` updated
 * [jsonnet-bundler](https://github.com/jsonnet-bundler/jsonnet-bundler)
   * Our fork [projectsyn/jsonnet-bundler](https://github.com/projectsyn/jsonnet-bundler) is currently recommended.
     It parallelizes fetching of dependencies, which speeds up Commodore significantly, and has fixes to make the dependency fetching more deterministic.

diff --git a/docs/modules/ROOT/pages/explanation/running-commodore.adoc b/docs/modules/ROOT/pages/explanation/running-commodore.adoc
@@ -17,7 +17,7 @@ We recommend that you use the Commodore Python package provided on PyPI to make
 
 === Prerequisites
 
-* A Python version between 3.8 and 3.11 as `python3` and the Python `venv` module.
+* A Python version between 3.10 and 3.11 as `python3` and the Python `venv` module.
 We recommend that you install Python and the `venv` module with your preferred package manager.
 * Additionally, a few of the Commodore Python package dependencies require a working C compiler, the Python 3 development package, and the FFI development package.
 On Linux distributions you'll want packages `python3-dev` or `python3-devel` and `libffi-dev` or `libffi-devel` respectively.
@@ -51,7 +51,7 @@ This command should report something like
 +
 [source]
 ----
-Python 3.8.10
+Python 3.11.9
 ----
 
 . Create a virtualenv in `~/.local/commodore-venv`

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -20,7 +20,7 @@ include = [
 ]
 
 [tool.poetry.dependencies]
-python = ">=3.8, <3.12"
+python = ">=3.10, <3.12"
 # NOTE: We restrict boto3/botocore versions to reduce complexity of Poetry's
 # dependency resolution significantly, cf.
 # https://github.com/orgs/python-poetry/discussions/8165#discussioncomment-6387378

diff --git a/tox.ini b/tox.ini
@@ -6,7 +6,7 @@ envlist =
     bandit
     mypy
     black
-    py3{8,9,10,11}{,-bench}
+    py3{10,11}{,-bench}
     py311-reclass-rs
 
 [testenv]

diff --git a/tox.mk b/tox.mk
@@ -39,13 +39,7 @@ lintenv_mypy:
 lintenv_black:
 	$(TOX_COMMAND) -e black --notest
 
-.PHONY: test_py3.8 test_py3.9 test_py3.10 test_py3.11 test_py3.11_reclass_rs
-
-test_py3.8:
-	$(TOX_COMMAND) -e py38
-
-test_py3.9:
-	$(TOX_COMMAND) -e py39
+.PHONY: test_py3.10 test_py3.11 test_py3.11_reclass_rs
 
 test_py3.10:
 	$(TOX_COMMAND) -e py310
@@ -56,14 +50,7 @@ test_py3.11:
 test_py3.11_reclass_rs:
 	$(TOX_COMMAND) -e py311-reclass-rs
 
-.PHONY: testenv_py3.8 testenv_py3.9 testenv_py3.10 testenv_py3.11 testenv_py3.11_reclass_rs
-
-
-testenv_py3.8:
-	$(TOX_COMMAND) -e py38 --notest
-
-testenv_py3.9:
-	$(TOX_COMMAND) -e py39 --notest
+.PHONY: testenv_py3.10 testenv_py3.11 testenv_py3.11_reclass_rs
 
 testenv_py3.10:
 	$(TOX_COMMAND) -e py310 --notest
@@ -74,27 +61,15 @@ testenv_py3.11:
 testenv_py3.11_reclass_rs:
 	$(TOX_COMMAND) -e py311 --notest
 
-.PHONY: bench_py3.8 bench_py3.9 bench_py3.10 bench_py3.11
-
-bench_py3.8:
-	$(TOX_COMMAND) -e py38-bench
-
-bench_py3.9:
-	$(TOX_COMMAND) -e py39-bench
+.PHONY: bench_py3.10 bench_py3.11
 
 bench_py3.10:
 	$(TOX_COMMAND) -e py310-bench
 
 bench_py3.11:
 	$(TOX_COMMAND) -e py311-bench
 
-.PHONY: benchenv_py3.8 benchenv_py3.9 benchenv_py3.10 benchenv_py3.11
-
-benchenv_py3.8:
-	$(TOX_COMMAND) -e py38-bench --notest
-
-benchenv_py3.9:
-	$(TOX_COMMAND) -e py39-bench --notest
+.PHONY: benchenv_py3.10 benchenv_py3.11
 
 benchenv_py3.10:
 	$(TOX_COMMAND) -e py310-bench --notest