Imported Upstream version 59.7.0

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index ab0c95cfa567b547495941c009e176d8781db129..44072dee542fdee019cb9033485c0d2221fbbd8d 100644 (file)
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 59.6.0
+current_version = 59.7.0
 commit = True
 tag = True
 

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 265be8497c7d1d3f1a6d58ad5d782536acd33bf5..6b546dc477e7de62cf7881e3c14d4620646905b8 100644 (file)
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -10,8 +10,8 @@ jobs:
         - stdlib
         - local
         python:
-        - pypy3
-        - 3.6
+        - pypy-3.7
+        - 3.7
         - 3.9
         - "3.10"
         platform:

diff --git a/CHANGES.rst b/CHANGES.rst
index 9b38064e17c730dcf5279cd39c1ea90d1bf8b58f..5c898fa85b2142727ea53fe9a5727f4b4d3ed163 100644 (file)
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,12 @@
+v59.7.0
+-------
+
+
+Changes
+^^^^^^^
+* #2930: Require Python 3.7
+
+
 v59.6.0
 -------
 

diff --git a/pytest.ini b/pytest.ini
index 8cc1052d1256c4025c15f315f59f6a7e2ac324a9..5c0ad039a47ce9aecc7d0c49f266c7f463c5dfd6 100644 (file)
--- a/pytest.ini
+++ b/pytest.ini
@@ -12,8 +12,6 @@ filterwarnings=
        ## upstream
        # Suppress deprecation warning in flake8
        ignore:SelectableGroups dict interface is deprecated::flake8
-       # Suppress deprecation warning in pypa/packaging#433
-       ignore:The distutils package is deprecated::packaging.tags
        ## end upstream
 
        # https://github.com/pypa/setuptools/issues/1823

diff --git a/setup.cfg b/setup.cfg
index c04eff2dd5b33c9171f43cc2d03f783a2ac21a9e..343ea2ad2961f2c4ae2df28804af1cfb2fca33da 100644 (file)
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = setuptools
-version = 59.6.0
+version = 59.7.0
 author = Python Packaging Authority
 author_email = distutils-sig@python.org
 description = Easily download, build, install, upgrade, and uninstall Python packages
@@ -24,7 +24,7 @@ project_urls =
 packages = find_namespace:
 # disabled as it causes tests to be included #2505
 # include_package_data = true
-python_requires = >=3.6
+python_requires = >=3.7
 install_requires =
 
 [options.packages.find]

diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index 70c5794c471bfebc6c57db29a24938299a4e74b9..1aeb7ffeaf7cbf1f57d6a0f6258a79b7e43fd0a1 100644 (file)
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -219,6 +219,6 @@ class TestNamespaces:
         # now run 'sample' with the prefix on the PYTHONPATH
         bin = 'Scripts' if platform.system() == 'Windows' else 'bin'
         exe = prefix / bin / 'sample'
-        if sys.version_info < (3, 7) and platform.system() == 'Windows':
+        if sys.version_info < (3, 8) and platform.system() == 'Windows':
             exe = str(exe)
         subprocess.check_call([exe], env=env)