Drop support for python 2.7, 3.4, and 3.5 #376

jdufresne · 2020-12-28T04:30:58Z

Fixes #305

tests/test_markers.py

pradyunsg

Me likey! We'd probably want to do a follow up, that cleans up the typing shenanigans we have here.

jdufresne · 2020-12-28T16:18:22Z

We'd probably want to do a follow up, that cleans up the typing shenanigans we have here.

I would be happy to.

pradyunsg · 2020-12-28T17:18:08Z

packaging/specifiers.py

@@ -97,7 +106,7 @@ class _IndividualSpecifier(BaseSpecifier):

    def __init__(self, spec="", prereleases=None):
        # type: (str, Optional[bool]) -> None
-        match = self._regex.search(spec)
+        match = self._regex.search(spec)  # type: ignore


Why is this necessary?

Good point, it isn't. I've removed the comment and am now defining _regex on the class with a type.

jdufresne · 2020-12-28T22:53:40Z

We'd probably want to do a follow up, that cleans up the typing shenanigans we have here.

I started this work in #378. As a convenience, it builds off of this PR. If/when this lands, I'll go ahead and rebase it.

pradyunsg · 2020-12-28T23:02:52Z

Wheeee! So many PRs and commits to review! Thanks a lot for pushing this forward @jdufresne, it is genuinely appreciated.

I'll catch up with the rest of the PRs tomorrow, but feel free to @-mention me in case I miss some PR. :)

brettcannon

Thanks for doing this! A change that was propagated throughout test_tags does need to be reverted, though.

tests/test_tags.py

ShadowJonathan · 2021-01-29T22:06:33Z

@di @brettcannon @pradyunsg what is this PR waiting for?

di · 2021-01-29T22:18:34Z

See my comment here: #385 (comment), although now that 20.9 is out this can probably be merged.

brettcannon · 2021-01-29T23:52:15Z

@ShadowJonathan we are tracking the discussion at #305

brettcannon · 2021-02-02T01:19:11Z

@jdufresne would you mind taking one more pass for your PR to pick any new code/changes that came in since you did this work? I'm also fine with not merging anymore PRs until this goes in if you are up for doing this.

/cc @pradyunsg about possibly pausing PR merging until this gets done to prevent anymore skew.

Fixes #305

With Python 2 support dropped, these imports are no longer necessary.

In Python 3, all files are utf-8 by default.

With Python 2 support dropped, the fallbacks are not required.

As the package no longer supports Python 2, the wheel is not universal.

With Python 2 support dropped, these compatibility shims are no longer necessary.

Also restore `if` statement guards.

jdufresne · 2021-02-02T02:48:25Z

@brettcannon

I rebased and added two new commits:

Rerun pyupgrade
Simplify formatting repr strings

brettcannon · 2021-02-02T23:15:13Z

@di @pradyunsg I refreshed our review statuses as I think enough has changed to warrant another look.

@jdufresne thanks for the updates! I'm hoping to review this week.

packaging/markers.py

packaging/requirements.py

packaging/specifiers.py

packaging/version.py

brettcannon · 2021-02-05T22:08:12Z

@jdufresne I've approved the PR, but there are a couple of small tweaks that could be made if you're up for it while we wait to see if anyone else wants to review this before it's merged.

packaging/requirements.py

Co-authored-by: Brett Cannon <brett@python.org>

packaging/version.py

jdufresne · 2021-02-06T02:00:54Z

Thanks for the review Brett and all. I've applied all suggestions.

CHANGELOG.rst

Co-authored-by: Pradyun Gedam <3275593+pradyunsg@users.noreply.github.com>

brettcannon · 2021-02-06T18:30:25Z

It's been about a week since the pip release with packaging 20.9 went out and there haven't been any macOS issues filed here or on pip that I can tell. That suggests to me that we are in the clear to take this and bid adieu to Python 2.7 (and 3.4 and 3.5)! 🎉

The ignore was added in #1, and was migrated from `.coveragerc` to the `pyproject.toml` in #586, even though the file had already been deleted over a year ago in #376. Since the file no longer exists, the ignore should just be removed.

uranusjr reviewed Dec 28, 2020

View reviewed changes

tests/test_markers.py Show resolved Hide resolved

pradyunsg approved these changes Dec 28, 2020

View reviewed changes

pradyunsg reviewed Dec 28, 2020

View reviewed changes

jdufresne mentioned this pull request Dec 28, 2020

Clean up and improve typing #378

Merged

brettcannon requested changes Jan 4, 2021

View reviewed changes

tests/test_tags.py Outdated Show resolved Hide resolved

brettcannon self-requested a review January 5, 2021 18:01

brettcannon approved these changes Jan 6, 2021

View reviewed changes

pradyunsg mentioned this pull request Jan 11, 2021

New release with ability to load 10.9 Universal2 wheels on ARM #385

Closed

This was referenced Jan 11, 2021

ARCH and REQUIRES_PYTHON plan pypa/cibuildwheel#528

Closed

Poetry does not install from wheels on macOS Big Sur python-poetry/poetry#3458

Closed

di approved these changes Jan 15, 2021

View reviewed changes

Base automatically changed from master to main January 21, 2021 19:20

jdufresne added 11 commits February 1, 2021 18:25

Drop support for python 2.7, 3.4, and 3.5

2ec3774

Fixes #305

Remove __future__ imports

f32285b

With Python 2 support dropped, these imports are no longer necessary.

Remove encoding comment

fab8649

In Python 3, all files are utf-8 by default.

Remove object from class definition

f69eae5

Use short super() syntax

ff7256b

Remove outdated ImportError fallbacks

8ce2feb

With Python 2 support dropped, the fallbacks are not required.

Remove Python 2 shim for missing sys.implementation

84ad110

Remove "universal" from "bdist_wheel" configuration

395c89d

As the package no longer supports Python 2, the wheel is not universal.

Remove _compat.py

a5491e8

With Python 2 support dropped, these compatibility shims are no longer necessary.

Remove Python 2 urlparse import

dac6f54

Partially revert changes to mock_interpreter_name()

9f5752b

Also restore `if` statement guards.

jdufresne added 2 commits February 1, 2021 18:30

Rerun pyupgrade

f86573b

Simplify formatting repr strings

ef0a066

brettcannon requested review from di, brettcannon and pradyunsg February 2, 2021 23:14

brettcannon mentioned this pull request Feb 3, 2021

Clarify some release details #392

Merged

brettcannon approved these changes Feb 5, 2021

View reviewed changes

jdufresne commented Feb 6, 2021

View reviewed changes

packaging/requirements.py Outdated Show resolved Hide resolved

jdufresne commented Feb 6, 2021

View reviewed changes

packaging/requirements.py Outdated Show resolved Hide resolved

Updates from Brett Cannon's review

d2fe834

Co-authored-by: Brett Cannon <brett@python.org>

jdufresne commented Feb 6, 2021

View reviewed changes

packaging/version.py Outdated Show resolved Hide resolved

Update packaging/version.py

626523f

pradyunsg approved these changes Feb 6, 2021

View reviewed changes

CHANGELOG.rst Outdated Show resolved Hide resolved

Update CHANGELOG.rst

b44fb35

Co-authored-by: Pradyun Gedam <3275593+pradyunsg@users.noreply.github.com>

brettcannon merged commit 4d60352 into pypa:main Feb 6, 2021

jdufresne deleted the drop-py2 branch February 6, 2021 18:58

hauntsaninja mentioned this pull request Jul 16, 2022

Using type annotations instead of comments #576

Closed

shenanigansd mentioned this pull request Dec 19, 2023

Remove coverage ignore for non-existent file #752

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Drop support for python 2.7, 3.4, and 3.5 #376

Drop support for python 2.7, 3.4, and 3.5 #376

jdufresne commented Dec 28, 2020

pradyunsg left a comment

jdufresne commented Dec 28, 2020

pradyunsg Dec 28, 2020

jdufresne Dec 28, 2020

jdufresne commented Dec 28, 2020

pradyunsg commented Dec 28, 2020

brettcannon left a comment

ShadowJonathan commented Jan 29, 2021

di commented Jan 29, 2021

brettcannon commented Jan 29, 2021

brettcannon commented Feb 2, 2021

jdufresne commented Feb 2, 2021

brettcannon commented Feb 2, 2021

brettcannon commented Feb 5, 2021

jdufresne commented Feb 6, 2021

brettcannon commented Feb 6, 2021

Drop support for python 2.7, 3.4, and 3.5 #376

Drop support for python 2.7, 3.4, and 3.5 #376

Conversation

jdufresne commented Dec 28, 2020

pradyunsg left a comment

Choose a reason for hiding this comment

jdufresne commented Dec 28, 2020

pradyunsg Dec 28, 2020

Choose a reason for hiding this comment

jdufresne Dec 28, 2020

Choose a reason for hiding this comment

jdufresne commented Dec 28, 2020

pradyunsg commented Dec 28, 2020

brettcannon left a comment

Choose a reason for hiding this comment

ShadowJonathan commented Jan 29, 2021

di commented Jan 29, 2021

brettcannon commented Jan 29, 2021

brettcannon commented Feb 2, 2021

jdufresne commented Feb 2, 2021

brettcannon commented Feb 2, 2021

brettcannon commented Feb 5, 2021

jdufresne commented Feb 6, 2021

brettcannon commented Feb 6, 2021