From 1627d7466a2b13d76ee03f6416d2f7bd6b46638a Mon Sep 17 00:00:00 2001
From: Ran Benita <ran@unusedvar.com>
Date: Sat, 24 Feb 2024 10:54:44 +0200
Subject: [PATCH] Remove support for Python 3.7, add official support for
 Python 3.12

3.7 is EOL.
---
 .github/workflows/test.yml | 6 ++----
 .pre-commit-config.yaml    | 2 +-
 CHANGELOG.rst              | 5 +++++
 doc/install.rst            | 2 +-
 pyproject.toml             | 6 +++---
 testing/conftest.py        | 2 +-
 tox.ini                    | 2 +-
 7 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5cc7af8b..c388cf57 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -34,7 +34,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ windows-latest, ubuntu-latest ]
-        python: [ "3.7","3.8","3.10","3.11", "pypy-3.7" ]
+        python: [ "3.8","3.10","3.11","3.12", "pypy-3.8" ]
 
     steps:
     - uses: actions/checkout@v4
@@ -53,9 +53,7 @@ jobs:
         python-version: ${{ matrix.python }}
 
     - name: Install tox
-      run: |
-        python -m pip install --upgrade pip
-        pip install tox
+      run: pip install tox
 
     - name: Test
       shell: bash
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 75b18443..ea3571c9 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -18,7 +18,7 @@ repos:
     rev: v3.15.1
     hooks:
     -   id: pyupgrade
-        args:  [--py37-plus]
+        args:  [--py38-plus]
 -   repo: https://github.com/astral-sh/ruff-pre-commit
     rev: v0.2.2
     hooks:
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index a0f0d67a..5c3148ef 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,8 @@
+2.1.0 (UNRELEASED)
+
+* Removed support for Python 3.7.
+* Added official support for Python 3.12.
+
 2.0.2 (2023-07-09)
 ------------------
 
diff --git a/doc/install.rst b/doc/install.rst
index 04f1313a..e7bb7038 100644
--- a/doc/install.rst
+++ b/doc/install.rst
@@ -1,7 +1,7 @@
 Info in a nutshell
 ====================
 
-**Pythons**: 3.7+, PyPy 3
+**Pythons**: 3.8+, PyPy 3
 
 **Operating systems**: Linux, Windows, OSX, Unix
 
diff --git a/pyproject.toml b/pyproject.toml
index 50efb9f1..cd6e5abb 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -11,7 +11,7 @@ dynamic = ["version"]
 description = "execnet: rapid multi-Python deployment"
 readme = {"file" = "README.rst", "content-type" = "text/x-rst"}
 license = "MIT"
-requires-python = ">=3.7"
+requires-python = ">=3.8"
 authors = [
     { name = "holger krekel and others" },
 ]
@@ -22,11 +22,11 @@ classifiers = [
     "Operating System :: MacOS :: MacOS X",
     "Operating System :: Microsoft :: Windows",
     "Operating System :: POSIX",
-    "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",
     "Programming Language :: Python :: Implementation :: PyPy",
     "Topic :: Software Development :: Libraries",
@@ -68,4 +68,4 @@ include = [
 ]
 
 [tool.mypy]
-python_version = "3.7"
+python_version = "3.8"
diff --git a/testing/conftest.py b/testing/conftest.py
index 9ec44d30..86bd93e0 100644
--- a/testing/conftest.py
+++ b/testing/conftest.py
@@ -109,7 +109,7 @@ def pytest_generate_tests(metafunc):
         metafunc.parametrize("gw", gwtypes, indirect=True)
 
 
-@lru_cache()
+@lru_cache
 def getexecutable(name):
     if name == "sys.executable":
         return sys.executable
diff --git a/tox.ini b/tox.ini
index 2449698a..4c743a66 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist=py{37,38,39,310,311,pypy37},docs,linting
+envlist=py{38,39,310,311,312,pypy38},docs,linting
 isolated_build = true
 
 [testenv]