Skip to content
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

Merged
merged 4 commits into from
Sep 27, 2022

Conversation

AA-Turner
Copy link
Member

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

  • Refactoring

A

@AA-Turner AA-Turner changed the base branch from 5.x to master May 23, 2022 00:46
@AA-Turner AA-Turner requested a review from tk0miya May 23, 2022 00:47
@AA-Turner AA-Turner self-assigned this May 23, 2022
@AA-Turner AA-Turner added this to the 6.0.0 milestone May 23, 2022
@AA-Turner AA-Turner force-pushed the increase-minimum-supported branch 3 times, most recently from b6fe58d to 3cc189d Compare June 16, 2022 22:12
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}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
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.

Copy link
Member Author

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

Copy link
Contributor

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):
Copy link
Contributor

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 <=?

Copy link
Member Author

@AA-Turner AA-Turner Sep 25, 2022

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

@AA-Turner AA-Turner force-pushed the increase-minimum-supported branch 3 times, most recently from b19245a to 58e894c Compare September 27, 2022 16:42
@AA-Turner AA-Turner merged commit bb62d2a into sphinx-doc:master Sep 27, 2022
@AA-Turner AA-Turner deleted the increase-minimum-supported branch September 27, 2022 17:31
@ericholscher ericholscher mentioned this pull request Oct 5, 2022
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Oct 28, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants