support: remove support for python 3.6

Author: delfick

.github/workflows/linux_ci.yml

@@ -38,7 +38,6 @@ jobs:
 
           pyenv --version
 
-          pyenv install 3.6.13
           pyenv install 3.7.10
           pyenv install 3.8.10
           pyenv install 3.9.5
@@ -52,7 +51,6 @@ jobs:
           set -e
 
           pyenv versions
-          V36=$(pyenv whence python3.6)
           V37=$(pyenv whence python3.7)
           V38=$(pyenv whence python3.8)
           V39=$(pyenv whence python3.9)
@@ -63,7 +61,6 @@ jobs:
 
           cat <<EOF > pythons.json
           {
-            "python3.6": "$ROOT/versions/$V36/bin/python",
             "python3.7": "$ROOT/versions/$V37/bin/python",
             "python3.8": "$ROOT/versions/$V38/bin/python",
             "python3.9": "$ROOT/versions/$V39/bin/python",

.github/workflows/mac_ci.yml

@@ -32,7 +32,7 @@ jobs:
         id: python_cache
         uses: actions/cache@v2
         with:
-          key: python3.6.13_3.7.10_3.8.10_3.9.5_3.10.13_3.11.6
+          key: python3.7.10_3.8.10_3.9.5_3.10.13_3.11.6
           path: |
             /opt/hostedtoolcache/pyenv_root
             ~/hostedtoolcache/pyenv_root
@@ -48,9 +48,6 @@ jobs:
           unset LDFLAGS
           unset CFLAGS
 
-          curl -sSL https://github.com/python/cpython/commit/8ea6353.patch\?full_index\=1 > /tmp/patch
-
-          pyenv install --patch 3.6.13 < /tmp/patch
           for version in 3.7.10 3.8.10 3.9.5 3.10.13 3.11.6; do
             pyenv install $version
           done
@@ -62,7 +59,6 @@ jobs:
           set -e
 
           pyenv versions
-          V36=$(pyenv whence python3.6)
           V37=$(pyenv whence python3.7)
           V38=$(pyenv whence python3.8)
           V39=$(pyenv whence python3.9)
@@ -73,7 +69,6 @@ jobs:
 
           cat <<eof > pythons.json
           {
-            "python3.6": "$ROOT/versions/$V36/bin/python",
             "python3.7": "$ROOT/versions/$V37/bin/python",
             "python3.8": "$ROOT/versions/$V38/bin/python",
             "python3.9": "$ROOT/versions/$V39/bin/python",

.github/workflows/windows_ci.yml

@@ -28,7 +28,7 @@ jobs:
         id: python_cache
         uses: actions/cache@v2
         with:
-          key: python3.6.8_3.7.9_3.8.10_3.9.6_3.10.13_3.11.6
+          key: python3.7.9_3.8.10_3.9.6_3.10.13_3.11.6
           path: |
             ~/.pyenv
 
@@ -47,7 +47,6 @@ jobs:
 
           pyenv --version
 
-          pyenv install 3.6.8
           pyenv install 3.7.9
           pyenv install 3.8.10
           pyenv install 3.9.6
@@ -64,7 +63,6 @@ jobs:
           ROOT=~/.pyenv
           ls $ROOT
           pyenv whence python
-          V36=$(pyenv whence python3.6)
           V37=$(pyenv whence python3.7)
           V38=$(pyenv whence python3.8)
           V39=$(pyenv whence python3.9)
@@ -73,7 +71,6 @@ jobs:
 
           cat <<EOF > pythons.json
           {
-            "python3.6": "~/.pyenv/pyenv-win/versions/$V36/python.exe",
             "python3.7": "~/.pyenv/pyenv-win/versions/$V37/python.exe",
             "python3.8": "~/.pyenv/pyenv-win/versions/$V38/python.exe",
             "python3.9": "~/.pyenv/pyenv-win/versions/$V39/python.exe",

README.rst

@@ -15,7 +15,6 @@ Python:
 .. code-block:: python
 
   {
-    "python3.6": "~/.pyenv/versions/3.6.13/bin/python",
     "python3.7": "~/.pyenv/versions/3.7.12/bin/python",
     "python3.8": "~/.pyenv/versions/3.8.12/bin/python",
     "python3.9": "~/.pyenv/versions/3.9.6/bin/python"
@@ -26,7 +25,7 @@ Python:
 In this example I'm using pyenv to get copies of each Python. Using pyenv isn't
 a requirement, but it does make it easy! There is nothing in the tests that rely
 on features in any particular version, and so the minor patch of each version is
-irrelevant. All that matters is having some version of 3.6, 3.7, 3.8, 3.9 and 3.10.
+irrelevant. All that matters is having some version of 3.7, 3.8, 3.9, 3.10 and 3.11.
 
 I recommend running the tests in a virtualenv. I use virtualenvwrapper for this
 but you can also do a ``python3 -m venv my_venv`` somewhere and use that.

docs/changelog.rst

@@ -1,6 +1,12 @@
 Changelog
 ---------
 
+.. _release-0.12.0:
+
+0.12.0 - TBD
+   * Removed support for python3.6
+   * Changed packaging to use hatch
+
 .. _release-0.11.0:
 
 0.11.0 - 17 Feburary 2022

pyproject.toml

@@ -8,7 +8,7 @@ dynamic = ["version"]
 description = "Tool to create virtualenvs, manage versions of packages in it and use it start a particular program"
 readme = "README.rst"
 license = "MIT"
-requires-python = ">= 3.6"
+requires-python = ">= 3.7"
 authors = [
     { name = "Stephen Moore", email = "[email protected]" },
 ]

tests/conftest.py

@@ -17,7 +17,7 @@
 
 this_dir = Path(__file__).parent
 
-regexes = {"version": re.compile(r"3\.(6|7|8|9|10)")}
+regexes = {"version": re.compile(r"3\.(6|7|8|9|10|11)")}
 
 
 class Pythons:
@@ -32,13 +32,13 @@ def __getitem__(self, key):
         if not isinstance(key, (float, str)):
             assert (
                 False
-            ), f"Can only get a python location using a float or string of 3.6, 3.7, etc. Used {key}"
+            ), f"Can only get a python location using a float or string of 3.7, 3.8, etc. Used {key}"
 
         key = str(key)
         if not regexes["version"].match(key):
             assert (
                 False
-            ), f"Can only get a python location using a float or string of 3.6, 3.7, etc. Used {key}"
+            ), f"Can only get a python location using a float or string of 3.7, 3.8, etc. Used {key}"
 
         return self.locations[f"python{key}"]
 
@@ -58,7 +58,7 @@ def pythons_json(self, want):
 
         if not isinstance(pythons, dict):
             pytest.exit(
-                'The pythons.json must be a dictionary of {"python3.6": <location>, "python3.7": <location>, ...}'
+                'The pythons.json must be a dictionary of {"python3.7": <location>, "python3.7": <location>, ...}'
             )
 
         missing = want - set(pythons)
@@ -122,6 +122,10 @@ def ensure_venvstarter(self, python_exe):
             with tempfile.TemporaryDirectory() as tmpdir:
                 PythonHandler().run_command(python_exe, "import venvstarter", cwd=tmpdir)
         except FailedToGetOutput:
+            subprocess.run(
+                [str(python_exe), "-m", "pip", "install", "pip", "--upgrade"],
+                check=True,
+            )
             subprocess.run(
                 [str(python_exe), "-m", "pip", "install", "-e", str(this_dir.parent)],
                 check=True,
@@ -150,7 +154,7 @@ def ensure_venvstarter_version(self, python_exe, venv_location, errors):
                     return False
 
     def find(self):
-        want = set(["python3.6", "python3.7", "python3.8", "python3.9", "python3.10"])
+        want = set(["python3.7", "python3.8", "python3.9", "python3.10", "python3.11"])
         pythons = self.pythons_json(want)
         for k in want:
             location = self.normalise_python_location(pythons, k)

tests/test_creation.py

@@ -10,18 +10,18 @@
 
 describe "Finding the right version":
 
-    @pytest.mark.parametrize("version", [3.7, 3.8, 3.9, "3.10"])
+    @pytest.mark.parametrize("version", [3.8, 3.9, "3.10", "3.11"])
     it "will always use current version if no max is specified", version:
 
         def script():
-            __import__("venvstarter").manager("python").min_python("3.6").run()
+            __import__("venvstarter").manager("python").min_python("3.7").run()
 
         with pytest.helpers.PATH.configure(version, python="3.10", python3="3.10"):
             exe = pytest.helpers.pythons[version]
             with pytest.helpers.make_script(script, exe=exe, prepare_venv=True) as filename:
                 pytest.helpers.assertPythonVersion(filename, str(version))
 
-    @pytest.mark.parametrize("version", [3.7, 3.8, 3.9, "3.10"])
+    @pytest.mark.parametrize("version", [3.7, 3.8, 3.9, "3.10", "3.11"])
     it "will use the only version available if within min and max", version:
 
         def script(version):
@@ -32,7 +32,7 @@ def script(version):
                 with pytest.helpers.PATH.configure(use, python3=use, python=use):
                     exe = pytest.helpers.pythons[use]
                     with pytest.helpers.make_script(
-                        script, str(version), exe=exe, prepare_venv=True
+                        script, repr(str(version)), exe=exe, prepare_venv=True
                     ) as filename:
                         pytest.helpers.assertPythonVersion(filename, str(use))
 
@@ -41,7 +41,7 @@ def script(version):
         def script():
             __import__("venvstarter").manager("python").min_python(3.7).run()
 
-        with pytest.helpers.PATH.configure(3.6, 3.7, python3=3.6, python=3.6, mock_sys=3.6):
+        with pytest.helpers.PATH.configure(3.7, 3.8, python3=3.7, python=3.7, mock_sys=3.7):
             with pytest.helpers.make_script(script, prepare_venv=True) as filename:
                 pytest.helpers.assertPythonVersion(filename, "3.7")
 
@@ -74,17 +74,17 @@ def break_location(location):
         def script():
             __import__("venvstarter").manager("python").min_python(3.7).run()
 
-        with pytest.helpers.PATH.configure(3.6, 3.7, python3=3.6, python=3.6, mock_sys=3.6):
+        with pytest.helpers.PATH.configure(3.7, 3.8, python3=3.7, python=3.7, mock_sys=3.7):
             with pytest.helpers.make_script(script, prepare_venv=True) as filename:
                 pytest.helpers.assertPythonVersion(filename, "3.7")
 
                 with pytest.helpers.PATH.configure(
-                    3.6, 3.7, 3.8, python3=3.8, python=3.8, mock_sys=3.8
+                    3.7, 3.8, 3.9, python3=3.9, python=3.9, mock_sys=3.9
                 ):
                     pytest.helpers.assertPythonVersion(filename, "3.7")
 
                     def script():
                         __import__("venvstarter").manager("python").min_python(3.8).run()
 
                     pytest.helpers.write_script(script, filename=filename)
-                    pytest.helpers.assertPythonVersion(filename, "3.8")
+                    pytest.helpers.assertPythonVersion(filename, "3.9")

tests/test_finding_python.py

@@ -8,62 +8,62 @@
     describe "finding the right python":
         it "defaults max version to whatever python3, python and sys.executable are":
             with pytest.helpers.PATH.configure(
-                3.6, 3.8, 3.9, python3=3.8, python=3.8, mock_sys=3.8
+                3.7, 3.9, "3.10", python3=3.9, python=3.9, mock_sys=3.9
             ):
-                PythonHandler("3.6", None).find() == pytest.helpers.pythons[3.8]
+                PythonHandler("3.7", None).find() == pytest.helpers.pythons[3.9]
 
             with pytest.helpers.PATH.configure(
-                3.6, 3.8, 3.9, python3=3.9, python=3.8, mock_sys=3.8
+                3.7, 3.9, "3.10", python3=3.10, python=3.9, mock_sys=3.9
             ):
-                PythonHandler("3.6", None).find() == pytest.helpers.pythons[3.9]
+                PythonHandler("3.7", None).find() == pytest.helpers.pythons["3.10"]
 
             with pytest.helpers.PATH.configure(
-                3.6, 3.8, 3.9, python3=3.8, python=3.9, mock_sys=3.8
+                3.7, 3.9, "3.10", python3=3.9, python="3.10", mock_sys=3.9
             ):
-                PythonHandler("3.6", None).find() == pytest.helpers.pythons[3.9]
+                PythonHandler("3.7", None).find() == pytest.helpers.pythons["3.10"]
 
             with pytest.helpers.PATH.configure(
-                3.6, 3.8, 3.9, python3=3.8, python=3.8, mock_sys=3.9
+                3.7, 3.9, "3.10", python3=3.9, python=3.9, mock_sys="3.10"
             ):
-                PythonHandler("3.6", None).find() == pytest.helpers.pythons[3.9]
+                PythonHandler("3.7", None).find() == pytest.helpers.pythons["3.10"]
 
         it "respects the actual max":
             with pytest.helpers.PATH.configure(
-                3.6, 3.8, 3.9, python3=3.8, python=3.8, mock_sys=3.8
+                3.7, 3.9, "3.10", python3=3.9, python=3.9, mock_sys=3.9
             ):
-                PythonHandler("3.6", "3.7").find() == pytest.helpers.pythons[3.7]
+                PythonHandler("3.7", "3.8").find() == pytest.helpers.pythons[3.8]
 
             with pytest.helpers.PATH.configure(
-                3.6, 3.8, 3.9, python3=3.9, python=3.8, mock_sys=3.8
+                3.7, 3.9, "3.10", python3="3.10", python=3.9, mock_sys=3.9
             ):
-                PythonHandler("3.6", "3.7").find() == pytest.helpers.pythons[3.7]
+                PythonHandler("3.7", "3.8").find() == pytest.helpers.pythons[3.8]
 
             with pytest.helpers.PATH.configure(
-                3.6, 3.8, 3.9, python3=3.8, python=3.9, mock_sys=3.8
+                3.7, 3.9, "3.10", python3=3.9, python="3.10", mock_sys=3.9
             ):
-                PythonHandler("3.6", "3.7").find() == pytest.helpers.pythons[3.7]
+                PythonHandler("3.7", "3.8").find() == pytest.helpers.pythons[3.8]
 
             with pytest.helpers.PATH.configure(
-                3.6, 3.8, 3.9, python3=3.8, python=3.8, mock_sys=3.9
+                3.7, 3.9, "3.10", python3=3.9, python=3.9, mock_sys="3.10"
             ):
-                PythonHandler("3.6", "3.7").find() == pytest.helpers.pythons[3.7]
+                PythonHandler("3.7", "3.8").find() == pytest.helpers.pythons[3.8]
 
         it "defaults max to the specified min if the main ones are less":
             with pytest.helpers.PATH.configure(
-                3.6, 3.8, 3.9, python3=3.6, python=3.6, mock_sys=3.6
+                3.7, 3.9, "3.10", python3=3.7, python=3.7, mock_sys=3.7
             ):
                 with pytest.raises(
                     Exception,
-                    match="Couldn't find a suitable python!\nWanted between 3.7.0 and 3.7.0",
+                    match="Couldn't find a suitable python!\nWanted between 3.8.0 and 3.8.0",
                 ):
-                    PythonHandler("3.7", None).find()
+                    PythonHandler("3.8", None).find()
 
         it "steps through versions":
             with pytest.helpers.PATH.configure(
-                3.6, 3.8, 3.9, python3=3.9, python=3.6, mock_sys=3.9
+                3.7, 3.9, "3.10", python3="3.10", python=3.7, mock_sys="3.10"
             ):
-                PythonHandler("3.7", "3.8").find() == pytest.helpers.pythons[3.8]
+                PythonHandler("3.8", "3.9").find() == pytest.helpers.pythons[3.9]
 
         it "works when there is only one version":
-            with pytest.helpers.PATH.configure(3.7, python3=3.7, python=3.7, mock_sys=3.7):
-                PythonHandler(3.7, 3.7).find() == pytest.helpers.pythons[3.7]
+            with pytest.helpers.PATH.configure(3.8, python3=3.8, python=3.8, mock_sys=3.8):
+                PythonHandler(3.8, 3.8).find() == pytest.helpers.pythons[3.8]

tests/test_ignite.py

@@ -6,7 +6,7 @@
 
 describe "ignite":
 
-    @pytest.mark.parametrize("version", [3.6, 3.7, 3.8, 3.9])
+    @pytest.mark.parametrize("version", [3.7, 3.8, 3.9, "3.10", "3.11"])
     it "works", version:
 
         def script():
@@ -21,7 +21,7 @@ def script():
             ).run()
 
         with pytest.helpers.PATH.configure(
-            3.6, 3.7, 3.8, 3.9, python=version, python3=version, mock_sys=version
+            3.7, 3.8, 3.9, "3.10", "3.11", python=version, python3=version, mock_sys=version
         ):
             with pytest.helpers.make_script(script) as filename:
                 assert not (Path(filename).parent / ".blah").exists()