[AIRFLOW-6046] Fix Alembic migrations & sync it to 1.10.*

[kaxil]

Make sure you have checked all steps below.

Jira

• My PR addresses the following Airflow Jira issues and references them in the PR title. For example, "[AIRFLOW-XXX] My Airflow PR"
  • https://issues.apache.org/jira/browse/AIRFLOW-6046

Description

• Here are some details about my PR, including screenshots of any UI changes:
  From [AIRFLOW-5771] Straighten out alembic migrations #6442 (comment)

just tried doing an upgrade to 1.10.6 followed by an upgrade to master:

git checkout 1.10.6
alembic upgrade heads
git checkout master
alembic upgrade heads

Result is

ERROR [alembic.util.messaging] Requested revision 74effc47d867 overlaps with other requested revisions 004c1210f153
FAILED: Requested revision 74effc47d867 overlaps with other requested revisions 004c1210f153

Tests

• My PR adds the following unit tests OR does not need testing for this extremely good reason:

Commits

• My commits all reference Jira issues in their subject lines, and I have squashed multiple commits if they address the same issue. In addition, my commits follow the guidelines from "How to write a good git commit message":
  1. Subject is separated from body by a blank line
  2. Subject is limited to 50 characters (not including Jira issue reference)
  3. Subject does not end with a period
  4. Subject uses the imperative mood ("add", not "adding")
  5. Body wraps at 72 characters
  6. Body explains "what" and "why", not "how"

Documentation

• In case of new functionality, my PR adds documentation that describes how to use it.
  • All the public functions and the classes in the PR contain docstrings that explain what it does
  • If you implement backwards incompatible changes, please leave a note in the Updating.md so we can assign it to a appropriate release

[kaxil]

I have tested it with:

mkdir airflow_templ
export AIRFLOW_HOME=~/airflow_templ
mkvirtualenv airflow_templ
workon airflow_templ
pip install apache-airflow
workon airflow_templ
which airflow # Confirm Airflow Version
airflow initdb
pip install -U -e .# Update to Airflow master
which airflow # Confirm Airflow Version
airflow version
airflow db upgrade

Our original report is @mattinbits . Can you please test the upgrade with this PR @mattinbits too ?

[mattinbits]

I can but unfortunately it might take a few days- I was testing this in the office and will be back there Tuesday

[mattinbits]

OK, I managed to test it. Using the same approach with running alembic directly. Looks good to me.

[kaxil]

OK, I managed to test it. Using the same approach with running alembic directly. Looks good to me.

Thanks for confirming, have a nice weekend.

[codecov-io]

Codecov Report

Merging #6642 into master will decrease coverage by 0.48%.
The diff coverage is n/a.

@@ Coverage Diff @@## master #6642 +/- ##
==========================================
- Coverage 83.72% 83.24% -0.49% 
==========================================
Files 672 672 Lines 37567 37567 ==========================================
- Hits 31454 31273 -181 - Misses 6113 6294 +181

Impacted Files	Coverage Δ
airflow/kubernetes/volume_mount.py	44.44% <0%> (-55.56%)	⬇️
airflow/executors/sequential_executor.py	47.61% <0%> (-52.39%)	⬇️
airflow/kubernetes/volume.py	52.94% <0%> (-47.06%)	⬇️
airflow/kubernetes/pod_launcher.py	45.25% <0%> (-46.72%)	⬇️
airflow/kubernetes/refresh_config.py	50.98% <0%> (-23.53%)	⬇️
...rflow/contrib/operators/kubernetes_pod_operator.py	76.38% <0%> (-22.23%)	⬇️
airflow/utils/sqlalchemy.py	84.74% <0%> (-6.78%)	⬇️
airflow/jobs/local_task_job.py	85% <0%> (-5%)	⬇️
airflow/executors/__init__.py	63.26% <0%> (-4.09%)	⬇️
airflow/configuration.py	89.13% <0%> (-3.63%)	⬇️
... and 4 more

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update fa626f0...aad48f8. Read the comment docs.

[ashb]

LGTM.

[Fokko]

Thanks for picking this up @kaxil 👍