Skip to content

Commit 393bdd3

Browse files
committed
Drop 3.7 support
Signed-off-by: Bernát Gábor <[email protected]>
1 parent c70267c commit 393bdd3

File tree

13 files changed

+12
-28
lines changed

13 files changed

+12
-28
lines changed

.github/workflows/check.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,6 @@ jobs:
3939
- { os: macos-latest, py: "[email protected]" }
4040
- { os: macos-latest, py: "[email protected]" }
4141
- { os: macos-latest, py: "[email protected]" }
42-
- { os: macos-latest, py: "[email protected]" }
43-
- { os: ubuntu-latest, py: "3.7" }
44-
- { os: macos-13, py: "3.7" }
4542
exclude:
4643
- { os: windows-latest, py: "pypy-3.10" }
4744
- { os: windows-latest, py: "pypy-3.9" }

docs/changelog/2783.bugfix.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
Upgrade embedded wheels:
22

33
* setuptools to ``75.2.0`` from ``75.1.0``
4+
* Removed pip of ``24.0``
5+
* Removed setuptools of ``68.0.0``
6+
* Removed wheel of ``0.42.0``

docs/installation.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ request on our issue tracker.
9797

9898
Note:
9999

100+
- as of ``20.27.0`` -- ``2024-10-17`` -- we no longer support running under Python ``<=3.7``,
100101
- as of ``20.18.0`` -- ``2023-02-06`` -- we no longer support running under Python ``<=3.6``,
101102
- as of ``20.22.0`` -- ``2023-04-19`` -- we no longer support creating environments for Python ``<=3.6``.
102103

@@ -120,4 +121,4 @@ In case of macOS we support:
120121
Windows
121122
~~~~~~~
122123
- Installations from `python.org <https://www.python.org/downloads/>`_
123-
- Windows Store Python - note only `version 3.7+ <https://www.microsoft.com/en-us/p/python-38/9mssztt1n39l>`_
124+
- Windows Store Python - note only `version 3.8+ <https://www.microsoft.com/en-us/p/python-38/9mssztt1n39l>`_

pyproject.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ license = "MIT"
1818
maintainers = [
1919
{ name = "Bernat Gabor", email = "[email protected]" },
2020
]
21-
requires-python = ">=3.7"
21+
requires-python = ">=3.8"
2222
classifiers = [
2323
"Development Status :: 5 - Production/Stable",
2424
"Intended Audience :: Developers",
@@ -27,7 +27,6 @@ classifiers = [
2727
"Operating System :: Microsoft :: Windows",
2828
"Operating System :: POSIX",
2929
"Programming Language :: Python :: 3 :: Only",
30-
"Programming Language :: Python :: 3.7",
3130
"Programming Language :: Python :: 3.8",
3231
"Programming Language :: Python :: 3.9",
3332
"Programming Language :: Python :: 3.10",
@@ -106,7 +105,6 @@ build.targets.sdist.include = [
106105
version.source = "vcs"
107106

108107
[tool.ruff]
109-
target-version = "py37"
110108
line-length = 120
111109
format.preview = true
112110
format.docstring-code-line-length = 100

src/virtualenv/run/plugin/base.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,9 @@
22

33
import sys
44
from collections import OrderedDict
5+
from importlib.metadata import entry_points
56

6-
if sys.version_info >= (3, 8):
7-
from importlib.metadata import entry_points
8-
9-
importlib_metadata_version = ()
10-
else:
11-
from importlib_metadata import entry_points, version
12-
13-
importlib_metadata_version = tuple(int(i) for i in version("importlib_metadata").split(".")[:2])
7+
importlib_metadata_version = ()
148

159

1610
class PluginLoader:

src/virtualenv/seed/wheels/embed/__init__.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@
66

77
BUNDLE_FOLDER = Path(__file__).absolute().parent
88
BUNDLE_SUPPORT = {
9-
"3.7": {
10-
"pip": "pip-24.0-py3-none-any.whl",
11-
"setuptools": "setuptools-68.0.0-py3-none-any.whl",
12-
"wheel": "wheel-0.42.0-py3-none-any.whl",
13-
},
149
"3.8": {
1510
"pip": "pip-24.2-py3-none-any.whl",
1611
"setuptools": "setuptools-75.2.0-py3-none-any.whl",
@@ -47,7 +42,7 @@
4742
"wheel": "wheel-0.44.0-py3-none-any.whl",
4843
},
4944
}
50-
MAX = "3.7"
45+
MAX = "3.8"
5146

5247

5348
def get_embed_wheel(distribution, for_py_version):
Binary file not shown.
Binary file not shown.
Binary file not shown.

tasks/__main__zipapp.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,7 @@ def iterator(self, resource_name):
133133
def versioned_distribution_class():
134134
global _VER_DISTRIBUTION_CLASS # noqa: PLW0603
135135
if _VER_DISTRIBUTION_CLASS is None:
136-
if sys.version_info >= (3, 8):
137-
from importlib.metadata import Distribution # noqa: PLC0415
138-
else:
139-
from importlib_metadata import Distribution # noqa: PLC0415
136+
from importlib.metadata import Distribution # noqa: PLC0415
140137

141138
class VersionedDistribution(Distribution):
142139
def __init__(self, file_loader, dist_path) -> None:

tasks/upgrade_wheels.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
STRICT = "UPGRADE_ADVISORY" not in os.environ
1616

1717
BUNDLED = ["pip", "setuptools", "wheel"]
18-
SUPPORT = [(3, i) for i in range(7, 15)]
18+
SUPPORT = [(3, i) for i in range(8, 15)]
1919
DEST = Path(__file__).resolve().parents[1] / "src" / "virtualenv" / "seed" / "wheels" / "embed"
2020

2121

tests/unit/seed/embed/test_pip_invoke.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def test_base_bootstrap_via_pip_invoke(tmp_path, coverage_env, mocker, current_f
2525
def _load_embed_wheel(app_data, distribution, for_py_version, version): # noqa: ARG001
2626
return load_embed_wheel(app_data, distribution, old_ver, version)
2727

28-
old_ver = "3.7"
28+
old_ver = "3.8"
2929
old = BUNDLE_SUPPORT[old_ver]
3030
mocker.patch("virtualenv.seed.wheels.bundle.load_embed_wheel", side_effect=_load_embed_wheel)
3131

tox.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ env_list =
1010
3.10
1111
3.9
1212
3.8
13-
3.7
1413
coverage
1514
readme
1615
docs

0 commit comments

Comments
 (0)