Merge branch 'master' of https://github.com/apache/airflow into #12401-…

…creating-duplicate-connection-in-ui

.github/workflows/build-images-workflow-run.yml

@@ -36,7 +36,7 @@ env:
   # Airflow one is going to be used
   CONSTRAINTS_GITHUB_REPOSITORY: >-
     ${{ secrets.CONSTRAINTS_GITHUB_REPOSITORY != '' &&
-        secrets.CONSTRAINTS_GITHUB_REPOSITORY || github.repository }}
+        secrets.CONSTRAINTS_GITHUB_REPOSITORY || 'apache/airflow' }}
   # This token is WRITE one - workflow_run type of events always have the WRITE token
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   # This token should not be empty in workflow_run type of event.
@@ -409,8 +409,8 @@ jobs:
       DOCKER_CACHE: ${{ needs.cancel-workflow-runs.outputs.cacheDirective }}
       FORCE_PULL_BASE_PYTHON_IMAGE: >
         ${{ needs.cancel-workflow-runs.sourceEvent == 'schedule' && 'true' || 'false' }}
-      VERSION_SUFFIX_FOR_PYPI: "dev"
-      VERSION_SUFFIX_FOR_SVN: "dev"
+      VERSION_SUFFIX_FOR_PYPI: ".dev0"
+      VERSION_SUFFIX_FOR_SVN: ".dev0"
     steps:
       - name: >
           Checkout [${{ needs.cancel-workflow-runs.outputs.sourceEvent }}]

.github/workflows/ci.yml

@@ -43,7 +43,7 @@ env:
   # Airflow one is going to be used
   CONSTRAINTS_GITHUB_REPOSITORY: >-
     ${{ secrets.CONSTRAINTS_GITHUB_REPOSITORY != '' &&
-        secrets.CONSTRAINTS_GITHUB_REPOSITORY || github.repository }}
+        secrets.CONSTRAINTS_GITHUB_REPOSITORY || 'apache/airflow' }}
   # In builds from forks, this token is read-only. For scheduler/direct push it is WRITE one
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   # In builds from forks, this token is empty, and this is good because such builds do not even try
@@ -520,8 +520,8 @@ ${{ hashFiles('.pre-commit-config.yaml') }}"
       RUNS_ON: ${{ fromJson(needs.build-info.outputs.runsOn) }}
       AIRFLOW_EXTRAS: "all"
       PYTHON_MAJOR_MINOR_VERSION: ${{needs.build-info.outputs.defaultPythonVersion}}
-      VERSION_SUFFIX_FOR_PYPI: "dev"
-      VERSION_SUFFIX_FOR_SVN: "dev"
+      VERSION_SUFFIX_FOR_PYPI: ".dev0"
+      VERSION_SUFFIX_FOR_SVN: ".dev0"
       GITHUB_REGISTRY: ${{ needs.ci-images.outputs.githubRegistry }}
     if: needs.build-info.outputs.image-build == 'true' && needs.build-info.outputs.default-branch == 'master'
     steps:
@@ -545,19 +545,20 @@ ${{ hashFiles('.pre-commit-config.yaml') }}"
         env:
           PACKAGE_FORMAT: "wheel"
       - name: "Prepare airflow package: wheel"
-        run: ./scripts/ci/build_airflow/ci_build_airflow_package.sh
+        run: ./scripts/ci/build_airflow/ci_build_airflow_packages.sh
         env:
           PACKAGE_FORMAT: "wheel"
       - name: "Install and test provider packages and airflow via wheel files"
         run: ./scripts/ci/provider_packages/ci_install_and_test_provider_packages.sh
         env:
           USE_AIRFLOW_VERSION: "wheel"
           PACKAGE_FORMAT: "wheel"
-      - name: "Install and test provider packages and airflow on Airflow 2.0 files"
+      - name: "Install and test provider packages and airflow on Airflow 2.1 files"
         run: ./scripts/ci/provider_packages/ci_install_and_test_provider_packages.sh
         env:
-          USE_AIRFLOW_VERSION: "2.0.0"
+          USE_AIRFLOW_VERSION: "2.1.0"
           PACKAGE_FORMAT: "wheel"
+        if: false
 
   prepare-test-provider-packages-sdist:
     timeout-minutes: 40
@@ -568,8 +569,8 @@ ${{ hashFiles('.pre-commit-config.yaml') }}"
       RUNS_ON: ${{ fromJson(needs.build-info.outputs.runsOn) }}
       AIRFLOW_EXTRAS: "all"
       PYTHON_MAJOR_MINOR_VERSION: ${{needs.build-info.outputs.defaultPythonVersion}}
-      VERSION_SUFFIX_FOR_PYPI: "dev"
-      VERSION_SUFFIX_FOR_SVN: "dev"
+      VERSION_SUFFIX_FOR_PYPI: ".dev0"
+      VERSION_SUFFIX_FOR_SVN: ".dev0"
       GITHUB_REGISTRY: ${{ needs.ci-images.outputs.githubRegistry }}
     if: needs.build-info.outputs.image-build == 'true' && needs.build-info.outputs.default-branch == 'master'
     steps:
@@ -591,7 +592,7 @@ ${{ hashFiles('.pre-commit-config.yaml') }}"
         env:
           PACKAGE_FORMAT: "sdist"
       - name: "Prepare airflow package: sdist"
-        run: ./scripts/ci/build_airflow/ci_build_airflow_package.sh
+        run: ./scripts/ci/build_airflow/ci_build_airflow_packages.sh
         env:
           PACKAGE_FORMAT: "sdist"
       - name: "Install and test provider packages and airflow via sdist files"

.markdownlint.yml

@@ -16,41 +16,42 @@
 # under the License.
 #
 ---
-# MD004/ul-style
+# https://github.com/DavidAnson/markdownlint#rules--aliases
+# MD004 ul-style - Unordered list style
 MD004: false
 
-# MD007/ul-indent
+# MD007 ul-indent - Unordered list indentation
 MD007: false
 
-# MD012/no-multiple-blanks
+# MD012 no-multiple-blanks - Multiple consecutive blank lines
 MD012: false
 
-# MD013 Line length
+# MD013 line-length - Line length
 MD013: false
 
-# MD024/no-duplicate-heading/no-duplicate-header
+# MD024 no-duplicate-heading/no-duplicate-header - Multiple headings with the same content
 MD024: false
 
-# MD026/no-trailing-punctuation
+# MD026 no-trailing-punctuation - Trailing punctuation in heading
 MD026: false
 
-# MD029/ol-prefix
+# MD029 ol-prefix - Ordered list item prefix
 MD029: false
 
-# MD030/list-marker-space
+# MD030 list-marker-space - Spaces after list markers
 MD030: false
 
-# MD033/no-inline-html
+# MD033 no-inline-html - Inline HTML
 MD033: false
 
-# MD034/no-bare-urls
+# MD034 no-bare-urls - Bare URL used
 MD034: false
 
-# MD036/no-emphasis-as-heading/no-emphasis-as-header
+# MD036 no-emphasis-as-heading/no-emphasis-as-header - Emphasis used instead of a heading
 MD036: false
 
-# MD040/fenced-code-language
+# MD040 fenced-code-language - Fenced code blocks should have a language specified
 MD040: false
 
-# MD041/first-line-heading/first-line-h1
+# MD041 first-line-heading/first-line-h1 - First line in a file should be a top-level heading
 MD041: false