From 2ffb426178b1de8b902f05d14a9f04acf5ad8213 Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Sat, 5 Nov 2022 12:02:03 -0300
Subject: [PATCH] Drop Python 3.6 and use Python 3.10 for secondary builds

---
 .github/workflows/main.yml | 23 ++++++++++-------------
 setup.cfg                  |  3 +--
 tox.ini                    | 16 ++++++++--------
 3 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2df3b92..5a09646 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -11,19 +11,16 @@ jobs:
       fail-fast: false
       matrix:
         tox_env:
-          - "py36-pytestlatest"
           - "py37-pytestlatest"
           - "py38-pytestlatest"
           - "py39-pytestlatest"
           - "py310-pytestlatest"
-          - "py38-pytestmain"
-          - "py38-psutil"
-          - "py38-setproctitle"
+          - "py310-pytestmain"
+          - "py310-psutil"
+          - "py310-setproctitle"
 
         os: [ubuntu-latest, windows-latest]
         include:
-          - tox_env: "py36-pytestlatest"
-            python: "3.6"
           - tox_env: "py37-pytestlatest"
             python: "3.7"
           - tox_env: "py38-pytestlatest"
@@ -32,12 +29,12 @@ jobs:
             python: "3.9"
           - tox_env: "py310-pytestlatest"
             python: "3.10"
-          - tox_env: "py38-pytestmain"
-            python: "3.8"
-          - tox_env: "py38-psutil"
-            python: "3.8"
-          - tox_env: "py38-setproctitle"
-            python: "3.8"
+          - tox_env: "py310-pytestmain"
+            python: "3.10"
+          - tox_env: "py310-psutil"
+            python: "3.10"
+          - tox_env: "py310-setproctitle"
+            python: "3.10"
 
     steps:
     - uses: actions/checkout@v3
@@ -72,7 +69,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v2
       with:
-        python-version: "3.7"
+        python-version: "3.10"
     - name: Install wheel
       run: |
         python -m pip install --upgrade pip
diff --git a/setup.cfg b/setup.cfg
index 9b4a3dd..ec418f9 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -24,7 +24,6 @@ classifiers =
     Programming Language :: Python
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3 :: Only
-    Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
@@ -40,7 +39,7 @@ project_urls =
 packages = find:
 package_dir = =src
 zip_safe = False
-python_requires = >=3.6
+python_requires = >=3.7
 install_requires =
     execnet>=1.1
     pytest>=6.2.0
diff --git a/tox.ini b/tox.ini
index 20ffd99..3fc7dea 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,10 +1,10 @@
 [tox]
 envlist=
   linting
-  py{36,37,38,39,310}-pytestlatest
-  py38-pytestmain
-  py38-psutil
-  py38-setproctitle
+  py{37,38,39,310}-pytestlatest
+  py310-pytestmain
+  py310-psutil
+  py310-setproctitle
 isolated_build = true
 [testenv]
 extras = testing
@@ -14,14 +14,14 @@ deps =
 commands=
   pytest {posargs}
 
-[testenv:py38-psutil]
+[testenv:py310-psutil]
 extras =
   testing
   psutil
 commands =
   pytest {posargs:-k psutil}
 
-[testenv:py38-setproctitle]
+[testenv:py310-setproctitle]
 extras =
   testing
   setproctitle
@@ -40,7 +40,7 @@ commands = pre-commit run --all-files --show-diff-on-failure
 [testenv:release]
 changedir=
 description = do a release, required posarg of the version number
-basepython = python3.7
+basepython = python3.10
 skipsdist = True
 usedevelop = True
 passenv = *
@@ -50,7 +50,7 @@ commands =
   towncrier build --version {posargs} --yes
 
 [testenv:docs]
-basepython = python3
+basepython = python3.10
 usedevelop = True
 deps =
     sphinx