Skip to content

Conversation

@shahar1
Copy link
Contributor

@shahar1 shahar1 commented Jan 12, 2025

backports: #45563


^ 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.rst or {issue_number}.significant.rst, in newsfragments.

@potiuk
Copy link
Member

potiuk commented Jan 12, 2025

After #45599 -> this one have a chance to work @shahar1, but I think you will have to have conditional dependency - depending on python versions, otherwise python3.8 won't be installable / image won't be buildable.

* 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)
@potiuk
Copy link
Member

potiuk commented Jan 12, 2025

OK. Rebased it after merging 3.9 as default - but I guess it might fail for Python 3.8 until the conditional sphinx /docutils for Python 3.9+

@potiuk
Copy link
Member

potiuk commented Jan 12, 2025

Yeah. That's what I thought. I added ; python_version >= '3.9' to all doc dependencies and it should help with building 3.8 image.

@potiuk potiuk merged commit 81e6215 into apache:v2-10-test Jan 12, 2025
111 checks passed
@potiuk
Copy link
Member

potiuk commented Jan 12, 2025

HURRAY! FIRST STEP DONE :)

potiuk added a commit to potiuk/airflow that referenced this pull request Jan 12, 2025
…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>
potiuk added a commit to potiuk/airflow that referenced this pull request Jan 12, 2025
…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>
@utkarsharma2 utkarsharma2 added the changelog:skip Changes that should be skipped from the changelog (CI, tests, etc..) label Jan 28, 2025
@utkarsharma2 utkarsharma2 added this to the Airflow 2.10.5 milestone Jan 28, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

changelog:skip Changes that should be skipped from the changelog (CI, tests, etc..) kind:documentation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants