-
Notifications
You must be signed in to change notification settings - Fork 16.4k
Upgrade sphinx and related dependencies #45563
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
Conversation
|
Drafting, weirdly on |
|
one more thing - last time when we tried to upgrade sphinx and docutils, the documentation looked ....weird .... lots of extra whitespace |
e65820a to
e534e96
Compare
|
Apparently it is a quite a tough task, here are some insights:
I'll be happy for some help in solving some of the riddles above, it will gets us closer to upgrading to Sphinx 7 :) |
4ab3172 to
990cc6f
Compare
990cc6f to
02a0446
Compare
|
#protm |
…html via Dockerfile.ci
|
It needs conflict resolution though :) |
jscheffl
left a comment
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.
For me "good enough" to go.
|
Merge conflicts on |
jscheffl
left a comment
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.
Good to merge in my view.
|
LGTM ! 🎉 🎉 🎉 🎉 🎉 🎉 🎉 🎉 🎉 |
Backport failed to create: v2-10-test. View the failure log Run details
You can attempt to backport this manually by running: cherry_picker a51ebe4 v2-10-testThis should apply the commit to the v2-10-test branch and leave the commit in conflict state marking After you have resolved the conflicts, you can continue the backport process by running: cherry_picker --continue |
* Upgrade sphinx and related dependencies * TEST COMMIT - DO NOT MERGE: modify airflow-site layout.html via Dockerfile.ci * fixup! TEST COMMIT - DO NOT MERGE: modify airflow-site layout.html via Dockerfile.ci * fixup! fixup! TEST COMMIT - DO NOT MERGE: modify airflow-site layout.html via Dockerfile.ci * Apply changes to css * Revert changes to Dockerfile.ci * Pull new Theme * Further CSS Patches to get closer * Remove duplicates --------- Co-authored-by: Jarek Potiuk <jarek@potiuk.com> Co-authored-by: Jens Scheffler <95105677+jscheffl@users.noreply.github.com> Co-authored-by: Epstein, Shahar <shahar.epstein@ncrvoyix.com> (cherry picked from commit a51ebe4)
* Upgrade sphinx and related dependencies * TEST COMMIT - DO NOT MERGE: modify airflow-site layout.html via Dockerfile.ci * fixup! TEST COMMIT - DO NOT MERGE: modify airflow-site layout.html via Dockerfile.ci * fixup! fixup! TEST COMMIT - DO NOT MERGE: modify airflow-site layout.html via Dockerfile.ci * Apply changes to css * Revert changes to Dockerfile.ci * Pull new Theme * Further CSS Patches to get closer * Remove duplicates --------- Co-authored-by: Jarek Potiuk <jarek@potiuk.com> Co-authored-by: Jens Scheffler <95105677+jscheffl@users.noreply.github.com> Co-authored-by: Epstein, Shahar <shahar.epstein@ncrvoyix.com> (cherry picked from commit a51ebe4)
* Upgrade sphinx and related dependencies (#45563) * Upgrade sphinx and related dependencies * TEST COMMIT - DO NOT MERGE: modify airflow-site layout.html via Dockerfile.ci * fixup! TEST COMMIT - DO NOT MERGE: modify airflow-site layout.html via Dockerfile.ci * fixup! fixup! TEST COMMIT - DO NOT MERGE: modify airflow-site layout.html via Dockerfile.ci * Apply changes to css * Revert changes to Dockerfile.ci * Pull new Theme * Further CSS Patches to get closer * Remove duplicates --------- Co-authored-by: Jarek Potiuk <jarek@potiuk.com> Co-authored-by: Jens Scheffler <95105677+jscheffl@users.noreply.github.com> Co-authored-by: Epstein, Shahar <shahar.epstein@ncrvoyix.com> (cherry picked from commit a51ebe4) * fixup! Upgrade sphinx and related dependencies (#45563) --------- Co-authored-by: Jarek Potiuk <jarek@potiuk.com>
…pache#45596) * Upgrade sphinx and related dependencies (apache#45563) * Upgrade sphinx and related dependencies * TEST COMMIT - DO NOT MERGE: modify airflow-site layout.html via Dockerfile.ci * fixup! TEST COMMIT - DO NOT MERGE: modify airflow-site layout.html via Dockerfile.ci * fixup! fixup! TEST COMMIT - DO NOT MERGE: modify airflow-site layout.html via Dockerfile.ci * Apply changes to css * Revert changes to Dockerfile.ci * Pull new Theme * Further CSS Patches to get closer * Remove duplicates --------- Co-authored-by: Jarek Potiuk <jarek@potiuk.com> Co-authored-by: Jens Scheffler <95105677+jscheffl@users.noreply.github.com> Co-authored-by: Epstein, Shahar <shahar.epstein@ncrvoyix.com> (cherry picked from commit a51ebe4) * fixup! Upgrade sphinx and related dependencies (apache#45563) --------- Co-authored-by: Jarek Potiuk <jarek@potiuk.com>
…pache#45596) * Upgrade sphinx and related dependencies (apache#45563) * Upgrade sphinx and related dependencies * TEST COMMIT - DO NOT MERGE: modify airflow-site layout.html via Dockerfile.ci * fixup! TEST COMMIT - DO NOT MERGE: modify airflow-site layout.html via Dockerfile.ci * fixup! fixup! TEST COMMIT - DO NOT MERGE: modify airflow-site layout.html via Dockerfile.ci * Apply changes to css * Revert changes to Dockerfile.ci * Pull new Theme * Further CSS Patches to get closer * Remove duplicates --------- Co-authored-by: Jarek Potiuk <jarek@potiuk.com> Co-authored-by: Jens Scheffler <95105677+jscheffl@users.noreply.github.com> Co-authored-by: Epstein, Shahar <shahar.epstein@ncrvoyix.com> (cherry picked from commit a51ebe4) * fixup! Upgrade sphinx and related dependencies (apache#45563) --------- Co-authored-by: Jarek Potiuk <jarek@potiuk.com>
* Upgrade sphinx and related dependencies * TEST COMMIT - DO NOT MERGE: modify airflow-site layout.html via Dockerfile.ci * fixup! TEST COMMIT - DO NOT MERGE: modify airflow-site layout.html via Dockerfile.ci * fixup! fixup! TEST COMMIT - DO NOT MERGE: modify airflow-site layout.html via Dockerfile.ci * Apply changes to css * Revert changes to Dockerfile.ci * Pull new Theme * Further CSS Patches to get closer * Remove duplicates --------- Co-authored-by: Jarek Potiuk <jarek@potiuk.com> Co-authored-by: Jens Scheffler <95105677+jscheffl@users.noreply.github.com> Co-authored-by: Epstein, Shahar <shahar.epstein@ncrvoyix.com>
* Upgrade sphinx and related dependencies * TEST COMMIT - DO NOT MERGE: modify airflow-site layout.html via Dockerfile.ci * fixup! TEST COMMIT - DO NOT MERGE: modify airflow-site layout.html via Dockerfile.ci * fixup! fixup! TEST COMMIT - DO NOT MERGE: modify airflow-site layout.html via Dockerfile.ci * Apply changes to css * Revert changes to Dockerfile.ci * Pull new Theme * Further CSS Patches to get closer * Remove duplicates --------- Co-authored-by: Jarek Potiuk <jarek@potiuk.com> Co-authored-by: Jens Scheffler <95105677+jscheffl@users.noreply.github.com> Co-authored-by: Epstein, Shahar <shahar.epstein@ncrvoyix.com>
* Upgrade sphinx and related dependencies * TEST COMMIT - DO NOT MERGE: modify airflow-site layout.html via Dockerfile.ci * fixup! TEST COMMIT - DO NOT MERGE: modify airflow-site layout.html via Dockerfile.ci * fixup! fixup! TEST COMMIT - DO NOT MERGE: modify airflow-site layout.html via Dockerfile.ci * Apply changes to css * Revert changes to Dockerfile.ci * Pull new Theme * Further CSS Patches to get closer * Remove duplicates --------- Co-authored-by: Jarek Potiuk <jarek@potiuk.com> Co-authored-by: Jens Scheffler <95105677+jscheffl@users.noreply.github.com> Co-authored-by: Epstein, Shahar <shahar.epstein@ncrvoyix.com>
* Upgrade sphinx and related dependencies * TEST COMMIT - DO NOT MERGE: modify airflow-site layout.html via Dockerfile.ci * fixup! TEST COMMIT - DO NOT MERGE: modify airflow-site layout.html via Dockerfile.ci * fixup! fixup! TEST COMMIT - DO NOT MERGE: modify airflow-site layout.html via Dockerfile.ci * Apply changes to css * Revert changes to Dockerfile.ci * Pull new Theme * Further CSS Patches to get closer * Remove duplicates --------- Co-authored-by: Jarek Potiuk <jarek@potiuk.com> Co-authored-by: Jens Scheffler <95105677+jscheffl@users.noreply.github.com> Co-authored-by: Epstein, Shahar <shahar.epstein@ncrvoyix.com>

closes: #31963
related: #39449
This PR update the following dependencies:
sphinxto v7+ (there's already v8, but it is supported only for Python 3.10)docutilsto v0.21+ (haven't encountered any<section>tags as mentioned in the deleted inline comment)sphinx-autoapito v3+ andastroidto v3+ (possible now thatsphinxis v7+)sphinxcontrib-serializinghtmlto v1.1.5+ (pinning it causes dependency conflicts)^ Add meaningful description above
Read the Pull Request Guidelines for more information.
In case of fundamental code changes, an Airflow Improvement Proposal (AIP) is needed.
In case of a new dependency, check compliance with the ASF 3rd Party License Policy.
In case of backwards incompatible changes please leave a note in a newsfragment file, named
{pr_number}.significant.rstor{issue_number}.significant.rst, in newsfragments.