Possible conflicts after string normalization in providers

[Jarek Potiuk <ja...@potiuk.com>]

Hey everyone,

I have just merged the change from Daniel about string normalization in
providers (https://github.com/apache/airflow/pull/27205).

Anyone who had a PR for providers might (and likely will) have a conflict.
It should be easy to fix though:

1. check that the only conflicting changes are the single to double quote
changes only
2. replace conflicting files with your changes
3. squash your changes into a single commit
4. if you have no pre-commit configured run `breeze static-checks
--last-commit `and it will redo Daniel’s changes in your changes

I just tested it on https://github.com/apache/airflow/pull/27196 and it
worked like a charm.

J.

Re: Possible conflicts after string normalization in providers

[Daniel Standish <da...@astronomer.io.INVALID>]

Ok -- just merged normalization for core. Now we're fully normalized.
Expect conflicts in your branches (if they touch core airflow).  Apologies
in advance.

Re: Possible conflicts after string normalization in providers

[Jarek Potiuk <ja...@potiuk.com>]

Cool! :)

On Mon, Oct 24, 2022 at 7:49 AM Daniel Standish
<da...@astronomer.io.invalid> wrote:

> OK -- the non-providers/non-core (a.k.a. "other") group of string
> normalization has just been merged.  So, if you already rebased, unlucky
> you -- you need to do it again.
>
> But fear not, you won't need to do it yet another time until closer to the
> release of airflow 2.5, when we'll apply string normalization on the rest
> of the repo, and this chapter will be closed.
>
> Thanks for your patience.
>

Re: Possible conflicts after string normalization in providers

[Daniel Standish <da...@astronomer.io.INVALID>]

OK -- the non-providers/non-core (a.k.a. "other") group of string
normalization has just been merged.  So, if you already rebased, unlucky
you -- you need to do it again.

But fear not, you won't need to do it yet another time until closer to the
release of airflow 2.5, when we'll apply string normalization on the rest
of the repo, and this chapter will be closed.

Thanks for your patience.

Re: Possible conflicts after string normalization in providers

[Daniel Standish <da...@astronomer.io.INVALID>]

Thanks Jarek

There will be a couple more notices like this as we apply to the rest of
the codebase.  Non-providers / non-core is coming soon, and core will be
applied closer to 2.5.

And if you don't want to squash to one commit, I think you can also just do
`pre-commit run black --all-files`, which doesn't take very long anyway.

You can also do something like this:

pre-commit run black --files $(git diff $(git merge-base main HEAD)
 --name-only)

And that should just run it on the files that show up in the diff between
your branch and main.

Thanks

On Sun, Oct 23, 2022 at 1:34 PM Jarek Potiuk <ja...@potiuk.com> wrote:

> Hey everyone,
>
> I have just merged the change from Daniel about string normalization in
> providers (https://github.com/apache/airflow/pull/27205).
>
> Anyone who had a PR for providers might (and likely will) have a conflict.
> It should be easy to fix though:
>
> 1. check that the only conflicting changes are the single to double quote
> changes only
> 2. replace conflicting files with your changes
> 3. squash your changes into a single commit
> 4. if you have no pre-commit configured run `breeze static-checks
> --last-commit `and it will redo Daniel’s changes in your changes
>
> I just tested it on https://github.com/apache/airflow/pull/27196 and it
> worked like a charm.
>
> J.
>
>