Update Python < 3.8 (3.2 to 3.7) obsolete code and comments #4096

Avasam · 2023-10-27T20:37:39Z

Summary of changes

Prompted by https://github.com/pypa/setuptools/pull/3979/files#r1257406447
Removing obsolete code and workarounds benefit type-checkers.

This PR avoids touching any of the _vendor, _distutils, extern or deprecated folders

More details for specific changes are added as comments below.

Pull Request Checklist

Changes have tests (the existing tests need to pass)
News fragment added in newsfragments/.
(See documentation for details)

Avasam · 2023-10-27T20:39:40Z

pkg_resources/__init__.py

-    import imp as _imp
-
-try:
-    FileExistsError


FileExistsError added in Python 3.3

pkg_resources/__init__.py

Avasam · 2023-10-27T20:47:42Z

setuptools/command/easy_install.py

@@ -257,8 +257,9 @@ def finalize_options(self):  # noqa: C901  # is too complex (25)  # FIXME
                'py_version_nodot': f'{sys.version_info.major}{sys.version_info.minor}',
                'sys_prefix': self.config_vars['prefix'],
                'sys_exec_prefix': self.config_vars['exec_prefix'],
-                # Only python 3.2+ has abiflags
+                # Only POSIX systems have abiflags


Source: https://docs.python.org/3/library/sys.html#sys.abiflags + tested on Windows

Avasam · 2023-10-27T20:48:05Z

setuptools/command/easy_install.py

                'abiflags': getattr(sys, 'abiflags', ''),
+                # Only python 3.9+ has platlibdir


Source: https://docs.python.org/3/library/sys.html#sys.platlibdir

Avasam · 2023-10-27T20:51:03Z

setuptools/monkey.py

@@ -138,8 +138,7 @@ def patch_for_msvc_specialized_compiler():
    Patch functions in distutils to use standalone Microsoft Visual C++
    compilers.
    """
-    # import late to avoid circular imports on Python < 3.5
-    msvc = import_module('setuptools.msvc')
+    from . import msvc


Basically a revert of b7b9cb2
Unless this still happens in newer versions, in which case the comment should be updated instead.

Avasam · 2023-11-07T03:46:32Z

setuptools/tests/test_packageindex.py

-        index = setuptools.package_index.PackageIndex(hosts=('www.example.com',))
-
-        # issue #160
-        if sys.version_info[0] == 2 and sys.version_info[1] == 7:


Python 2.7 test?

abravalheri

Thank you very much for your contribution. I see that you already started discussing with Jason about some of these changes, so I will leave it to him, but I just wanted to point out that some modifications on the docs might need some review. I left some comments (that also might also apply to the following parts of the documents, not only the preceeding lines in the Github diff).

docs/userguide/declarative_config.rst

docs/userguide/pyproject_config.rst

docs/userguide/quickstart.rst

…-python-3.2-to-3.6-code

Avasam · 2023-11-22T01:13:27Z

pkg_resources/__init__.py (66.7%): Missing lines 23
pkg_resources/tests/test_pkg_resources.py (100%)
setuptools/command/bdist_egg.py (100%)
setuptools/command/build.py (100%)
setuptools/command/dist_info.py (100%)
setuptools/monkey.py (100%)
setuptools/tests/test_distutils_adoption.py (100%)
setuptools/tests/test_find_packages.py (100%)
setuptools/tests/test_find_py_modules.py (100%)
-------------
Total:   12 lines
Missing: 1 line
Coverage: 91%
-------------

diffcov: commands[2]> diff-cover coverage.xml --compare-branch=origin/main --fail-under=100
Failure. Coverage is below 100%.

I'm guessing coverage of pkg_resources/__init__.py was already below 100%, because if anything my changes should make coverage go up as there's less branches.

Avasam · 2023-11-28T17:22:55Z

docs/userguide/entry_point.rst

-    which is a part of the standard library since Python 3.8. For older versions of
-    Python, its backport :pypi:`importlib_metadata` should be used. While using the
-    backport, the only change that has to be made is to replace ``importlib.metadata``
+    which is a part of the standard library since Python 3.8 and is non-provisional


I think the issue/reason to use importlib_metadata for Python older than 3.10 is python/importlib_metadata#396 ? Is that something we want to mention?

There are other reasons too - basically for early adoption of any behavior that was added to importlib_metadata but isn't yet in the supported Pythons. Still, that seems like something for cpython/importlib_metadata to advertise.

…-python-3.2-to-3.6-code

Avasam · 2024-01-12T17:03:00Z

@abravalheri There's been some small updates since your last review, so I reset your vote. There's also a ton of overlap with #4138 from @jaraco

jaraco · 2024-01-24T17:00:27Z

Thanks for all the work here. Let's get this merged. We can tweak more later if needed.

Avasam commented Oct 27, 2023

View reviewed changes

pkg_resources/__init__.py Outdated Show resolved Hide resolved

Avasam commented Oct 27, 2023

View reviewed changes

Avasam force-pushed the update-python-3.2-to-3.6-code branch from 714420f to 01ca1f2 Compare October 27, 2023 20:55

Avasam mentioned this pull request Oct 27, 2023

Fix all mypy issues #3979

Merged

2 tasks

Avasam changed the title ~~Update Python < 3.7 (3.2 to 3.6) obsolete code and comments~~ Update Python < 3.8 (3.2 to 3.7) obsolete code and comments Nov 7, 2023

Avasam force-pushed the update-python-3.2-to-3.6-code branch from bb4ff2f to 05ca49d Compare November 7, 2023 03:39

Update Python < 3.8 (3.2 to 3.7) obsolete code and comments

d97640a

Avasam force-pushed the update-python-3.2-to-3.6-code branch from 05ca49d to d97640a Compare November 7, 2023 03:42

Avasam commented Nov 7, 2023

View reviewed changes

abravalheri requested changes Nov 7, 2023

View reviewed changes

docs/userguide/declarative_config.rst Show resolved Hide resolved

docs/userguide/pyproject_config.rst Show resolved Hide resolved

docs/userguide/quickstart.rst Show resolved Hide resolved

Avasam force-pushed the update-python-3.2-to-3.6-code branch from 2ffc63c to c242f74 Compare November 8, 2023 00:03

Restore better config examples

7620221

Avasam force-pushed the update-python-3.2-to-3.6-code branch from c242f74 to 7620221 Compare November 8, 2023 00:05

Avasam requested a review from abravalheri November 8, 2023 00:06

abravalheri reviewed Nov 8, 2023

View reviewed changes

docs/userguide/quickstart.rst Outdated Show resolved Hide resolved

Avasam commented Nov 8, 2023

View reviewed changes

docs/userguide/quickstart.rst Outdated Show resolved Hide resolved

Fix accidental indentation change

f593095

Avasam commented Nov 8, 2023

View reviewed changes

docs/userguide/quickstart.rst Show resolved Hide resolved

Avasam requested a review from abravalheri November 8, 2023 20:16

Merge branch 'main' into update-python-3.2-to-3.6-code

f559d65

DimitriPapadopoulos mentioned this pull request Nov 17, 2023

Apply assorted Pyugrade suggestions #4056

Merged

2 tasks

Avasam added 3 commits November 21, 2023 19:06

Merge branch 'main' of https://github.com/pypa/setuptools into update…

10938cf

…-python-3.2-to-3.6-code

Fix RuffError post-merge

dc5dee8

Fix import error post-merge

bfae7be

abravalheri approved these changes Nov 22, 2023

View reviewed changes

Update missed redundant code.

6a744c5

Avasam mentioned this pull request Nov 28, 2023

Remove Python 3.7 compatibility #4138

Closed

2 tasks

Avasam commented Nov 28, 2023

View reviewed changes

Avasam added 4 commits December 23, 2023 21:43

Merge branch 'main' of https://github.com/pypa/setuptools into update…

b05644e

…-python-3.2-to-3.6-code

Merge branch 'main' into update-python-3.2-to-3.6-code

de16d24

post-merge fix

99cfb83

Merge branch 'main' into update-python-3.2-to-3.6-code

eba64db

Avasam requested a review from abravalheri January 12, 2024 17:01

jaraco approved these changes Jan 24, 2024

View reviewed changes

jaraco merged commit 1c4946a into pypa:main Jan 24, 2024
21 of 23 checks passed

Avasam deleted the update-python-3.2-to-3.6-code branch January 24, 2024 17:04

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update Python < 3.8 (3.2 to 3.7) obsolete code and comments #4096

Update Python < 3.8 (3.2 to 3.7) obsolete code and comments #4096

Avasam commented Oct 27, 2023 •

edited

Loading

Avasam Oct 27, 2023

Avasam Oct 27, 2023

Avasam Oct 27, 2023 •

edited

Loading

Avasam Oct 27, 2023

Avasam Nov 7, 2023

abravalheri left a comment •

edited

Loading

Avasam commented Nov 22, 2023 •

edited

Loading

Avasam Nov 28, 2023 •

edited

Loading

jaraco Jan 24, 2024

Avasam commented Jan 12, 2024

jaraco commented Jan 24, 2024

		'abiflags': getattr(sys, 'abiflags', ''),
		# Only python 3.9+ has platlibdir

Update Python < 3.8 (3.2 to 3.7) obsolete code and comments #4096

Update Python < 3.8 (3.2 to 3.7) obsolete code and comments #4096

Conversation

Avasam commented Oct 27, 2023 • edited Loading

Summary of changes

Pull Request Checklist

Avasam Oct 27, 2023

Choose a reason for hiding this comment

Avasam Oct 27, 2023

Choose a reason for hiding this comment

Avasam Oct 27, 2023 • edited Loading

Choose a reason for hiding this comment

Avasam Oct 27, 2023

Choose a reason for hiding this comment

Avasam Nov 7, 2023

Choose a reason for hiding this comment

abravalheri left a comment • edited Loading

Choose a reason for hiding this comment

Avasam commented Nov 22, 2023 • edited Loading

Avasam Nov 28, 2023 • edited Loading

Choose a reason for hiding this comment

jaraco Jan 24, 2024

Choose a reason for hiding this comment

Avasam commented Jan 12, 2024

jaraco commented Jan 24, 2024

Avasam commented Oct 27, 2023 •

edited

Loading

Avasam Oct 27, 2023 •

edited

Loading

abravalheri left a comment •

edited

Loading

Avasam commented Nov 22, 2023 •

edited

Loading

Avasam Nov 28, 2023 •

edited

Loading