From f2f60ebce69298be28a2697f9480943bb62adadb Mon Sep 17 00:00:00 2001
From: Sorin Sbarnea <ssbarnea@redhat.com>
Date: Wed, 25 Dec 2024 14:19:45 +0000
Subject: [PATCH] Remove support for py39

---
 .config/constraints.txt   |  2 +-
 .github/workflows/tox.yml |  7 +++----
 .pre-commit-config.yaml   |  4 ++--
 mypy.ini                  |  2 +-
 pyproject.toml            | 17 ++++++++---------
 tox.ini                   |  4 ++--
 6 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/.config/constraints.txt b/.config/constraints.txt
index 41430ff..c9eb003 100644
--- a/.config/constraints.txt
+++ b/.config/constraints.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.9
+# This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
 #    pip-compile --all-extras --no-annotate --output-file=.config/constraints.txt --strip-extras --unsafe-package=backports-tarfile --unsafe-package=cryptography --unsafe-package=exceptiongroup --unsafe-package=jeepney --unsafe-package=secretstorage --unsafe-package=twine pyproject.toml
diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
index 4c912d9..62c3311 100644
--- a/.github/workflows/tox.yml
+++ b/.github/workflows/tox.yml
@@ -29,13 +29,12 @@ jobs:
         id: generate_matrix
         uses: coactions/dynamic-matrix@v4
         with:
-          min_python: "3.9"
+          min_python: "3.10"
           default_python: |
-            3.9
             3.10
           max_python: "3.13"
           other_names: |
-            lint:tox -e py39-lint;tox -e py310-lint
+            lint:tox -e py310-lint;tox -e py310-lint
             docs
             integration
             pkg
@@ -156,7 +155,7 @@ jobs:
 
       - name: Check for expected number of coverage.xml reports
         run: |
-          JOBS_PRODUCING_COVERAGE=7
+          JOBS_PRODUCING_COVERAGE=6
           if [ "$(find . -name coverage.xml | wc -l | bc)" -ne "${JOBS_PRODUCING_COVERAGE}" ]; then
             echo "::error::Number of coverage.xml files was not the expected one (${JOBS_PRODUCING_COVERAGE}): $(find . -name coverage.xml |xargs echo)"
             exit 1
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 3bab1e8..5bd3170 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -103,7 +103,7 @@ repos:
         entry: pip-compile pyproject.toml
         files: ^.config\/.*requirements.*$
         language: python
-        language_version: "3.9" # minimal we support officially
+        language_version: "3.10" # minimal we support officially
         pass_filenames: false
         stages: [manual]
         additional_dependencies:
@@ -115,7 +115,7 @@ repos:
         entry: pip-compile pyproject.toml --upgrade
         files: ^.config\/.*requirements.*$
         language: python
-        language_version: "3.9" # minimal we support officially
+        language_version: "3.10" # minimal we support officially
         pass_filenames: false
         stages: [manual]
         additional_dependencies:
diff --git a/mypy.ini b/mypy.ini
index c1befcc..9133676 100644
--- a/mypy.ini
+++ b/mypy.ini
@@ -1,5 +1,5 @@
 [mypy]
-python_version = 3.9
+python_version = 3.10
 color_output = True
 error_summary = True
 # TODO(ssbarnea): Remove ignores below:
diff --git a/pyproject.toml b/pyproject.toml
index 2f922b2..fd0a3fd 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,13 +1,13 @@
 [build-system]
 requires = [
   "setuptools >= 65.3.0", # required by pyproject+setuptools_scm integration and editable installs
-  "setuptools_scm[toml] >= 7.0.5", # required for "no-local-version" scheme
+  "setuptools_scm[toml] >= 7.0.5" # required for "no-local-version" scheme
 ]
 build-backend = "setuptools.build_meta"
 
 [project]
 # https://peps.python.org/pep-0621/#readme
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 dynamic = ["version", "dependencies", "optional-dependencies"]
 name = "mk"
 description = "mk"
@@ -24,7 +24,6 @@ classifiers = [
   "Operating System :: MacOS",
   "Operating System :: POSIX",
   "Programming Language :: Python :: 3",
-  "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
@@ -33,7 +32,7 @@ classifiers = [
   "Programming Language :: Python",
   "Topic :: Software Development :: Quality Assurance",
   "Topic :: Software Development :: Testing",
-  "Topic :: Utilities",
+  "Topic :: Utilities"
 ]
 keywords = ["mk"]
 
@@ -95,7 +94,7 @@ concurrency = ["multiprocessing", "thread"]
 profile = "black"
 
 [tool.mypy]
-python_version = "3.9"
+python_version = "3.10"
 strict = true
 color_output = true
 error_summary = true
@@ -115,7 +114,7 @@ unsafe_package = [
   "exceptiongroup",
   "jeepney",
   "secretstorage",
-  "twine",
+  "twine"
 ]
 
 [tool.pylint."MESSAGES CONTROL"]
@@ -133,7 +132,7 @@ disable = [
   "missing-module-docstring",
   "no-value-for-parameter",
   "not-an-iterable",
-  "too-few-public-methods",
+  "too-few-public-methods"
 ]
 
 [tool.ruff]
@@ -161,7 +160,7 @@ lint.ignore = [
   "TCH",
   "PLR",
   "INP",
-  "RET",
+  "RET"
 ]
 lint.select = ["ALL"]
 
@@ -191,5 +190,5 @@ git_describe_command = [
   "--tags",
   "--long",
   "--match",
-  "v*.*",
+  "v*.*"
 ]
diff --git a/tox.ini b/tox.ini
index 7c85ab8..20a0cbb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -65,7 +65,7 @@ setenv =
   PRE_COMMIT_COLOR = always
   PYTHONHASHSEED = 0
   VIRTUALENV_NO_DOWNLOAD = 1
-  devel,lint,py{39,310,311,312,313},pkg,pre: PIP_CONSTRAINT = /dev/null
+  devel,lint,py{310,311,312,313},pkg,pre: PIP_CONSTRAINT = /dev/null
 
 allowlist_externals =
     bash
@@ -110,7 +110,7 @@ commands =
 white_list_externals =
   sh
 
-[testenv:lint,py{39,310,311,312,313}-lint]
+[testenv:lint,py{310,311,312,313}-lint]
 description = Run linters
 passenv = {[testenv]passenv}
           # without PROGRAMDATA cloning using git for Windows will fail with an