From 042476c3babeeb7a3c354997bd12e251da13dafb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bern=C3=A1t=20G=C3=A1bor?= Date: Mon, 25 Jul 2022 10:07:24 -0700 Subject: [PATCH 1/3] release 20.16.0 --- docs/changelog.rst | 10 ++++++++++ docs/changelog/2382.feature.rst | 1 - docs/changelog/2383.feature.rst | 2 -- 3 files changed, 10 insertions(+), 3 deletions(-) delete mode 100644 docs/changelog/2382.feature.rst delete mode 100644 docs/changelog/2383.feature.rst diff --git a/docs/changelog.rst b/docs/changelog.rst index 2331069f1..213303bfd 100644 --- 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 `_) +- Upgrade embedded pip to ``22.2`` from ``22.1.2`` and setuptools to ``63.2.0`` from ``62.6.0`` - + by :user:`gaborbernat`. (`#2383 `_) + + v20.15.1 (2022-06-28) --------------------- diff --git a/docs/changelog/2382.feature.rst b/docs/changelog/2382.feature.rst deleted file mode 100644 index fa980a583..000000000 --- a/docs/changelog/2382.feature.rst +++ /dev/null @@ -1 +0,0 @@ -Drop support for running under Python 2 (still can generate Python 2 environments) - by :user:`gaborbernat`. diff --git a/docs/changelog/2383.feature.rst b/docs/changelog/2383.feature.rst deleted file mode 100644 index f8084849c..000000000 --- a/docs/changelog/2383.feature.rst +++ /dev/null @@ -1,2 +0,0 @@ -Upgrade embedded pip to ``22.2`` from ``22.1.2`` and setuptools to ``63.2.0`` from ``62.6.0`` - -by :user:`gaborbernat`. From ecc1cb7d4a8fc1b880bc1f30c4589b614cadabf7 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 25 Jul 2022 17:08:00 +0000 Subject: [PATCH 2/3] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 27535e56d..707aafed9 100644 --- a/setup.cfg +++ b/setup.cfg @@ -45,7 +45,7 @@ install_requires = platformdirs>=2,<3 importlib-metadata>=0.12;python_version<"3.8" importlib-resources>=1.0;python_version<"3.7" -python_requires = >=3.6 +python_requires = >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.* package_dir = =src zip_safe = True From c0ba7809fb5d077ca12d4ab0dee4057513f908e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bern=C3=A1t=20G=C3=A1bor?= Date: Mon, 25 Jul 2022 10:11:06 -0700 Subject: [PATCH 3/3] Fix zipapp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Bernát Gábor Signed-off-by: Bernát Gábor --- .github/workflows/check.yml | 2 +- .pre-commit-config.yaml | 10 +++++++--- setup.cfg | 6 ++---- tasks/make_zipapp.py | 2 +- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 83cf6a701..8181b49f4 100644 --- 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 index 81c5b724c..f8497a4cc 100644 --- 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/setup.cfg b/setup.cfg index 707aafed9..02e780930 100644 --- 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 @@ -45,7 +43,7 @@ install_requires = platformdirs>=2,<3 importlib-metadata>=0.12;python_version<"3.8" importlib-resources>=1.0;python_version<"3.7" -python_requires = >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.* +python_requires = >=3.6 package_dir = =src zip_safe = True diff --git a/tasks/make_zipapp.py b/tasks/make_zipapp.py index 061cb533e..5a8a76070 100644 --- 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():