Merge pull request #2384 from pypa/release-20.16.0

pypa · Jul 25, 2022 · 717b595 · 717b595
2 parents 5a3cc8a + c0ba780
commit 717b595
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 11 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -189,7 +189,7 @@ jobs:
       - name: Build sdist and wheel
         run: python -m build -s -w . -o dist
       - name: Publish to PyPi
-        uses: pypa/gh-action-pypi-publish@main
+        uses: pypa/gh-action-pypi-publish@v1.5.1
         with:
           skip_existing: true
           user: __token__

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -12,9 +12,13 @@ repos:
   - id: end-of-file-fixer
   - id: trailing-whitespace
 - repo: https://github.com/asottile/pyupgrade
-  rev: v2.37.1
+  rev: v2.37.2
   hooks:
   - id: pyupgrade
+    args: ["--py36-plus"]
+    exclude: "^(src/virtualenv/create/via_global_ref/_virtualenv.py|src/virtualenv/create/via_global_ref/builtin/python2/site.py|src/virtualenv/discovery/py_info.py|tasks/__main__zipapp.py)$"
+  - id: pyupgrade
+    files: "^(src/virtualenv/create/via_global_ref/_virtualenv.py|src/virtualenv/create/via_global_ref/builtin/python2/site.py|src/virtualenv/discovery/py_info.py|tasks/__main__zipapp.py)$"
 - repo: https://github.com/PyCQA/isort
   rev: 5.10.1
   hooks:
@@ -39,10 +43,10 @@ repos:
   - id: tox-ini-fmt
     args: ["-p", "fix_lint"]
 - repo: https://github.com/asottile/setup-cfg-fmt
-  rev: v1.20.1
+  rev: v1.20.2
   hooks:
   - id: setup-cfg-fmt
-    args: [--min-py3-version, "3.5", "--max-py-version", "3.10"]
+    args: [--min-py3-version, "3.6  ", "--max-py-version", "3.10"]
 - repo: https://github.com/PyCQA/flake8
   rev: "4.0.1"
   hooks:

diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -5,6 +5,16 @@ Release History
 
 .. towncrier release notes start
 
+v20.16.0 (2022-07-25)
+---------------------
+
+Features - 20.16.0
+~~~~~~~~~~~~~~~~~~
+- Drop support for running under Python 2 (still can generate Python 2 environments) - by :user:`gaborbernat`. (`#2382 <https://github.com/pypa/virtualenv/issues/2382>`_)
+- Upgrade embedded pip to ``22.2`` from ``22.1.2`` and  setuptools to ``63.2.0`` from ``62.6.0`` -
+  by :user:`gaborbernat`. (`#2383 <https://github.com/pypa/virtualenv/issues/2383>`_)
+
+
 v20.15.1 (2022-06-28)
 ---------------------
 

diff --git a/docs/changelog/2382.feature.rst b/docs/changelog/2382.feature.rst
diff --git a/docs/changelog/2383.feature.rst b/docs/changelog/2383.feature.rst
diff --git a/setup.cfg b/setup.cfg
@@ -18,10 +18,8 @@ classifiers =
     Operating System :: MacOS :: MacOS X
     Operating System :: Microsoft :: Windows
     Operating System :: POSIX
-    Programming Language :: Python :: 2
-    Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.5
+    Programming Language :: Python :: 3 :: Only
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8

diff --git a/tasks/make_zipapp.py b/tasks/make_zipapp.py
@@ -20,7 +20,7 @@
 
 HERE = Path(__file__).parent.absolute()
 
-VERSIONS = [f"3.{i}" for i in range(10, 4, -1)] + ["2.7"]
+VERSIONS = [f"3.{i}" for i in range(10, 5, -1)]
 
 
 def main():