Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Upgrade Sphinx for 3.14 support; drop doc build support on 3.8; test 3.14#2112

Merged
EliahKagan merged 5 commits intogitpython-developers:mainfrom
EliahKagan:py314
Mar 9, 2026
Merged

Upgrade Sphinx for 3.14 support; drop doc build support on 3.8; test 3.14#2112
EliahKagan merged 5 commits intogitpython-developers:mainfrom
EliahKagan:py314

Conversation

@EliahKagan
Copy link
Member

@EliahKaganEliahKagan commentedMar 9, 2026
edited
Loading

As detailed ind1ca2af and8d97906, no version of Sphinx supports both Python 3.8 and Python 3.14. This makes changes analogous to those in#1954 and#1956, except to extend support to Python 3.14 (rather than Python 3.13), and the changes here are significantly simpler than what had to be done in#1954, since no Python code had to be changed in this case.

d1ca2af uses a newer Sphinx version range where supported.8d97906 then requires that version range, thereby dropping the ability to build documentation on 3.8, and adjusting CI accordingly. I did these as separate steps, expressing the version conditionally ind1ca2af, so that we can restore the relevant files to how they were there in the unexpected event that it's necessary to continue supporting building documentation on Python 3.8.

This adds some more interpreters to be tested regularly. The main purpose of this is to test Python 3.14 on GNU/Linux and macOS, where it is currently expected to work. It is expected only tomostly work on Windows, for the same reason that Python 3.13 is also only expected tomostly work on Windows. In both cases, there is a test that will fail on Windows. This is still as described in#1955, except that I haven't yet updated that to note that the situation is now the same for--and that it will thus also be able to address--Python 3.14.

Another change made to the interpreters tested here is that this tests free-threaded interpreters not only on GNU/Linux but also on macOS. We might want to undo that if it makes CI take longer overall. I expect that to rarely or never happen, but I'm not sure. I might find out during the course of testing this PR, which I'm doing in multiple pushes, whether that's a problem. For some more details (and rationale) on the interpreters added to be tested, seed1ab2e4 and53c0a88.


This remains a draft mainly because, while I know the documentaton builds, I want to look at the RTD docs to make sure they look okay--they should either look the same or slightly better due to the upgrade, but this shouldn't be assumed.

Edit:Here's the build, andhere's what it looks like. It looks the same as before, which is as expected--I just wanted to make sure it was no worse. With the newer Sphinx, I suspect it may be easier to make it lookbetter too, such as by looking at other themes that might make the content clearer, especially in the API reference. But that's not automatic, and it's definitely outside the scope of this PR.

The main remaning thing to check, beisdes that all CI jobs pass (they should actually all pass for each commit except53c0a88) is that macOS isn't what keeps CI on the PR from completing sooner. If so, then we might consider going back to testing free-threaded builds only on Ubuntu and not macOS, since that would decrease the number of macOS jobs by 2.

Further edit: See comments for more updates on this.

As discussed ingitpython-developers#2005 andgitpython-developers#2011, we had not been doing this before.Conditions have changed in two relevant ways:- The free-threaded interpreter has been around longer and it sees  more use.- The macOS runners are very fast now.The specific motivations for doing this now are:- In view of the condition described ingitpython-developers#2109 and how the change  there seems to have helped with it, there's some reason to think  *patch* versions of Python sometimes affect GitPython in ways it  makes possibly unfounded assumptions about the effect of garbage  collection. This mainly affects Windows and it is not specific to  free-threaded builds. However, in principle we could also see  assumptions violated in tests we think always work on Unix-like  operating systems, due to differences in how garbage collection  works in free-threaded interpreters. Therefore, the assumption  that this only needs to be tested occasionally is not as well  founded I assumed when I suggested testing it only on GNU/Linux.- We may add 3.14 jobs to CI soon, and it's useful to be able to  see how both free-threaded interpreters work on CI, as well as to  confirm for at least a short while that they are continuing to  work as expected.This macOS free-threaded interpreter CI jobs could be disabled oncemore if necessary, or if they're found to make CI complete slowerin PRs by even a small amount so long as they don't seem to besurfacing anything.
The status of 3.14 is now effectively the same as the status of3.13 when we started testing it ingitpython-developers#1990.This doesn't enable it on Windows yet, for the same reason that westill have not yet enabled regular CI tests of 3.13 on Windows. Itis hoped that 3.13 and 3.14 can be gotten fully working on Windows(rather than just mostly working, we think) soon; these exclusionsare meant to be temporary.Both the usual GIL interpreter and the free-threaded (nogil)intepreters are tested. See the immediately preceding commit on thetradeoffs involved in doing so.
Except on Python 3.8, where 7.1.2 is the latest compatible version.(This would also apply to versions lower than 3.8, but we don'tsupport building docs on any such versions, even though we stillsupport installing and using GitPython on 3.7.)The reason for this change is that, starting in Python 3.14, the`ast` module no longer has a `Str` member. String literals areinstead represented by `ast.Constant` (and the type of the valuecan be checked to see if it's a string). But versions of `sphinx`lower than 7.2.0 rely on `ast.Str` being present. This causes ourdocumentation not to be able to build at all starting in 3.14. Themost important part of the error is:    Exception occurred:      File "/opt/hostedtoolcache/Python/3.14.3/x64/lib/python3.14/site-packages/sphinx/pycode/__init__.py", line 141, in analyze        raise PycodeError(f'parsing {self.srcname!r} failed: {exc!r}') from exc    sphinx.errors.PycodeError: parsing '/home/runner/work/GitPython/GitPython/git/index/base.py' failed: AttributeError("module 'ast' has no attribute 'Str'")An example of code in `sphinx` 7.1.2 that will cause such an erroris `sphinx.pycode.parser.visit_Expr` implementation, which starts:if (isinstance(self.previous, (ast.Assign, ast.AnnAssign)) andisinstance(node.value, ast.Str)):In `sphinx` 7.2.0, `sphinx.pycode.parser.visit_Expr` insteadbegins:    if (isinstance(self.previous, (ast.Assign, ast.AnnAssign)) and            isinstance(node.value, ast.Constant) and isinstance(node.value.value, str)):This upgrades `sphinx` on all versions of Python where it *can* beinstalled at a version that has such changes -- rather than only onPython 3.14 -- for consistency, including consistency in possibleminor variations in generated documentation that could otherwisearise from using different versions of `sphinx` unnecessarily.As for why this upgrades to 7.4.7 rather than only to 7.2.0, that'sbecause they are both compatible with the same versions of Python,and as far as I know there's no reason to prefer an earlier versionwithin that range.Although GitPython still supports being installed and run on Python3.8 (and even on Python 3.7), it has been end-of-life (i.e., nolonger supported by the Python Software Foundation) for quite sometime now. That the version of Sphinx used to build documentationwill now be different on Python 3.8 than other versions is a reasonnot to use Python 3.8 for this purpose, but probablly already notthe most important reason.The change here is conceptually similar to, but much simpler than,the change ingitpython-developers#1954, which upgraded Sphinx to 7.1.2 on all Pythonversions GitPython suppports other than Python 3.7. The subsequentchange ingitpython-developers#1956 of removing support for building the GitPythondocumentation on Python 3.7 may be paralleled for 3.8 shortly.
This discontinues supporting building documentation on Python 3.8.It does not affect installing or running GitPython on Python 3.8(except when the `doc` extra is used, but this is only used forbuilding documentation). The reason is that it is no longerpossible to use the same version of Sphinx on Python 3.8 as on themost recent supported versions of Python, because Python 3.14 nolonger has `ast.Str` (using `str.Constant` for string literalsinstead), which causes the oldest version of `sphinx` that runs onPython 3.14 to be `sphinx` 7.2.0, while the newest version that isinstallable on Python 3.8 is `sphinx` 7.1.2.The immediately preceding commit changes the requirements for the`doc` extra to specify a newer `sphinx` version for Python 3.9 andlater. This can't be done on Python 3.8. Because there can besubtle differences in documentation generated with different`sphinx` versions, and because Python 3.8 has been end-of-life forsome time, it is not really worth carrying conditional dependenciesfor the `sphinx` version in `doc/requirements.txt`.Note that, while it is probably not a very good idea to useGitPython (or anything) on Python 3.8 since it is end-of-life, thischange does not stop supporting installing GitPython on that or anyother version it has been supporting. Installing and usingGitPython remains supported all the way back to Python 3.7 at thistime. This only affects the `doc` extra and its requirements.This change is analogous to the change made ingitpython-developers#1956, whichfollowed up on the change ingitpython-developers#1964 in the same way this changefollows up on the change in the immediately preceding commit.
@EliahKagan
Copy link
MemberAuthor

EliahKagan commentedMar 9, 2026
edited
Loading

That, as of this writing, all the still-pending checks at the tip of this PR are for macOS is some reason to think I may have been too eager in thinking we can run more jobs on macOS without it increasing the total PR check time.

Screenshot showning five pending checks, all waiting on macOS runners

However, I think the much shorter time macOS checks take than Windows checks will still make this not a problem. I'll check to see if that's really the case before assuming the enw checks in this PR don't have to be pared down before this is ready to merge.


Edit: I guessed wrong! The slowness of the Windows checks is outmatched by the smaller number of available macOS runners! I suspect that the Tahoe runners might be even faster, by an amount that reverses that, but the case for testing free-threaded interprters on macOS is weak enough right now that I'll just go back to testing free-threaded interpreters only on GNU/Linux on CI.

Edit 2: I've removed them in a new commit rather than rebasing out the original commit that added them, since I think both the process of testing them as well as their results are valuable to have in the history. I think this PR can be merged once CI passes on this new commit.

This effectively revertsd1ab2e4. It doesn't look like any problemsarose, and contrary to my guess, the additional jobs do actuallymake the checks that we intend to be blocking for PRs take longer,even after all non-macOS checks have completed.
Copy link
Contributor

CopilotAI left a comment

Choose a reason for hiding this comment

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

Pull request overview

This PR updates documentation build dependencies and CI configuration to accommodate Python 3.14 support, acknowledging that a single Sphinx version range can no longer support building docs on Python 3.8 while also supporting Python 3.14.

Changes:

  • Bump Sphinx requirement for documentation builds to a newer supported range (>=7.4.7,<8).
  • Extend CI test matrix to include Python 3.14 and 3.14 free-threaded (3.14t).
  • Adjust CI documentation-build gating intended to skip docs on Python 3.7 and 3.8.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 3 comments.

FileDescription
doc/requirements.txtUpdates Sphinx version range used by thedoc extra to a range compatible with Python 3.14.
.github/workflows/pythonpackage.ymlExtends the CI Python matrix and attempts to alter docs-build gating logic.

💡Add Copilot custom instructions for smarter, more guided reviews.Learn how to get started.

You can also share your feedback on Copilot code review.Take the survey.

@EliahKaganEliahKagan marked this pull request as ready for reviewMarch 9, 2026 23:31
@EliahKaganEliahKagan merged commit5780812 intogitpython-developers:mainMar 9, 2026
34 checks passed
@EliahKaganEliahKagan deleted the py314 branchMarch 9, 2026 23:32
@EliahKaganEliahKagan requested a review fromCopilotMarch 9, 2026 23:34
@EliahKagan

This comment was marked as resolved.

This comment was marked as resolved.

Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment

Reviewers

Copilot code reviewCopilotCopilot left review comments

Assignees

No one assigned

Labels

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@EliahKagan

[8]ページ先頭

©2009-2026 Movatter.jp