-
-
Notifications
You must be signed in to change notification settings - Fork 2.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Drop Python 3.7 and Docutils 0.17 #10470
Drop Python 3.7 and Docutils 0.17 #10470
Conversation
b6fe58d
to
3cc189d
Compare
tox.ini
Outdated
@@ -1,6 +1,6 @@ | |||
[tox] | |||
minversion = 2.4.0 | |||
envlist = docs,flake8,mypy,twine,py{36,37,38,39,310},du{14,15,16,17,18} | |||
envlist = docs,flake8,mypy,twine,coverage,py{36,37,38,39,310},du{17,18,19} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
envlist = docs,flake8,mypy,twine,coverage,py{36,37,38,39,310},du{17,18,19} | |
envlist = docs,flake8,mypy,twine,coverage,py{37,38,39,310,311},du{17,18,19} |
And below on line 18.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Adding 311 envs should be done on the 5.x branch, I've dropped the outdated envs on this PR.
A
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, please see #10871 to add 311
to 5.x.
@@ -149,7 +144,7 @@ def getslots(obj: Any) -> Optional[Dict]: | |||
|
|||
def isNewType(obj: Any) -> bool: | |||
"""Check the if object is a kind of NewType.""" | |||
if sys.version_info >= (3, 10): | |||
if sys.version_info[:2] >= (3, 10): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think all these [:2]
additions are unnecessary for >
, >=
and <
?
Or is it for consistency so we don't need to worry about <=
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I always forget which operator is the special case so personally adding [:2]
gives me more reassurance, you're likely right that it isn't strictly necessary.
A
3cc189d
to
576cdf1
Compare
b19245a
to
58e894c
Compare
58e894c
to
4684a42
Compare
Follows on from #10468, I polished up an experiment from April.
I dropped Docutils 0.16 and 0.17 in different commits. I would advocate for a higher minimum to reduce the matrix of potential Sphinx versions x Docutils versions, and by the time Sphinx 6 is released (April 2023) we may have Docutils 0.19 and 0.20.
I also have a few refactoring steps in a branch (https://github.com/AA-Turner/sphinx/tree/drop-py37-refactoring), although I'll propose those as PRs after we've dropped Python 3.6 / 3.7.
Feature or Bugfix
A