From: JinWang An Date: Mon, 27 Mar 2023 08:02:40 +0000 (+0900) Subject: Imported Upstream version 59.7.0 X-Git-Tag: upstream/59.7.0^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dea9d01a972700dfbf8d3c71089387b9ff20f1c1;p=platform%2Fupstream%2Fpython-setuptools.git Imported Upstream version 59.7.0 --- diff --git a/.bumpversion.cfg b/.bumpversion.cfg index ab0c95c..44072de 100644 --- 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 265be84..6b546dc 100644 --- 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 9b38064..5c898fa 100644 --- 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 8cc1052..5c0ad03 100644 --- 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 c04eff2..343ea2a 100644 --- 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 70c5794..1aeb7ff 100644 --- 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)