Skip to content

Conversation

@potiuk
Copy link
Member

@potiuk potiuk commented Jun 26, 2025

This PR synchronizes latest dev scrips/ci wiht main. There were a number of PRs have not been cherry-picked, so now, when we automatically cherr-pick them, we can have conflicts (and often do). After we synchronize it, the conflcts should be rare and easy to solve (for example regenerating breeze images.


^ 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 airflow-core/newsfragments.

@boring-cyborg boring-cyborg bot added area:dev-tools backport-to-v3-1-test Mark PR with this label to backport to v3-1-test branch labels Jun 26, 2025
@potiuk potiuk force-pushed the backport-8846bef-v3-0-test branch from 9de8372 to 8a834a2 Compare June 26, 2025 14:34
apache#52274)

Due to the way how it historically got added - we had two ways of
selecting whether we are installing airlfow dyanmically in breeze
with or without constraints:

* --install-airflow-with-constraints - was used in a few places
* --skip-airflow-constraints - was used in other places

The logic to handle those were broken at places where they
contradicted each other. This PR unifies it and only uses
the --install-airflow-with-constraints flag in all the places
where we need to determine whether constraints are used or not
and it fixes the logic.

The logic of installation had been reviewed, refactored into
separate methods doing smaller tasks and more diagnostics was
added.
(cherry picked from commit 8846bef)

Co-authored-by: Jarek Potiuk <jarek@potiuk.com>
@pierrejeambrun
Copy link
Member

Changeset is much bigger than the original PR is that expected?

@potiuk
Copy link
Member Author

potiuk commented Jun 26, 2025

Changeset is much bigger than the original PR is that expected?

Actually yes - because there were numerous conflicts and I realised that we have a number of non-cherry-picked PRs so instead (in order to avoid future conflicts and not having to cherry-pick all of them I simply synchronized with latest verison of the build scripts. Which means that I have to also change the description of the PR to explain it. But I think it's the right thing to do - because with the automated cherry-picks of dev scripts that will help to mininimse conflicts in those .

@potiuk potiuk changed the title [v3-0-test] Unify selecting constraints option when installing airflo… [v3-0-test] Synchronize latest dev scripts with main Jun 26, 2025
@potiuk
Copy link
Member Author

potiuk commented Jun 26, 2025

I updated the description to reflect the scope. And when you compare the dev with main now - they are pretty much the same - with just a few differences.

@potiuk potiuk merged commit 2d44c3d into apache:v3-0-test Jun 26, 2025
8 checks passed
@potiuk potiuk deleted the backport-8846bef-v3-0-test branch June 26, 2025 19:27
Copy link
Member

@pierrejeambrun pierrejeambrun left a comment

Choose a reason for hiding this comment

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

Thanks for the details Jarek, makes sense to me :) (I also just wanted to make sure that this wasn't a mistake)

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

Labels

area:dev-tools backport-to-v3-1-test Mark PR with this label to backport to v3-1-test branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants