This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new 1b27c3b5d5d Remove the "dev0" usage from the CI (#49665)
1b27c3b5d5d is described below
commit 1b27c3b5d5d0b20508e5bc174797613aa85064af
Author: Jarek Potiuk <[email protected]>
AuthorDate: Thu Apr 24 09:01:47 2025 +0200
Remove the "dev0" usage from the CI (#49665)
When we are building providers and airflow-core/task-sdk in our CI,
we stop using `.dev0` suffix - instead, when needed we use the
`--skip-tag-check` when building the providers - which should
eventually automatically handle building chicken-egg providers without
having to spcify and configuring them.
We want to first to make it work now without removing the "chicken-egg"
provider configuration. But the next step will be using the feature
where the chicken-egg providers configuration will be removed.
---
.github/workflows/ci-image-build.yml | 1 -
.github/workflows/ci-image-checks.yml | 2 +-
.github/workflows/generate-constraints.yml | 10 +++-------
.github/workflows/prod-image-build.yml | 4 +---
.github/workflows/push-image-cache.yml | 2 --
.github/workflows/release_dockerhub_image.yml | 3 +--
.github/workflows/test-providers.yml | 9 ++++-----
contributing-docs/testing/python_client_tests.rst | 2 +-
contributing-docs/testing/unit_tests.rst | 4 ++--
dev/breeze/doc/05_test_commands.rst | 2 +-
dev/refresh_images.sh | 4 ++--
11 files changed, 16 insertions(+), 27 deletions(-)
diff --git a/.github/workflows/ci-image-build.yml
b/.github/workflows/ci-image-build.yml
index c695778b87b..b4392930567 100644
--- a/.github/workflows/ci-image-build.yml
+++ b/.github/workflows/ci-image-build.yml
@@ -116,7 +116,6 @@ jobs:
PYTHON_MAJOR_MINOR_VERSION: ${{ matrix.python-version }}
DEFAULT_BRANCH: ${{ inputs.branch }}
DEFAULT_CONSTRAINTS_BRANCH: ${{ inputs.constraints-branch }}
- VERSION_SUFFIX_FOR_PYPI: "dev0"
GITHUB_REPOSITORY: ${{ github.repository }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_USERNAME: ${{ github.actor }}
diff --git a/.github/workflows/ci-image-checks.yml
b/.github/workflows/ci-image-checks.yml
index 3e7a3bba908..215e587ae8e 100644
--- a/.github/workflows/ci-image-checks.yml
+++ b/.github/workflows/ci-image-checks.yml
@@ -429,7 +429,7 @@ jobs:
- name: "Generate airflow python client"
run: >
breeze release-management prepare-python-client
--distribution-format both
- --version-suffix-for-pypi dev0 --python-client-repo
./airflow-client-python
+ --python-client-repo ./airflow-client-python
- name: "Show diff"
run: git diff --color HEAD
working-directory: ./airflow-client-python
diff --git a/.github/workflows/generate-constraints.yml
b/.github/workflows/generate-constraints.yml
index 0f740816863..e9b48670c67 100644
--- a/.github/workflows/generate-constraints.yml
+++ b/.github/workflows/generate-constraints.yml
@@ -59,7 +59,6 @@ jobs:
INCLUDE_SUCCESS_OUTPUTS: "true"
PYTHON_VERSIONS: ${{ inputs.python-versions-list-as-string }}
VERBOSE: "true"
- VERSION_SUFFIX_FOR_PYPI: "dev0"
steps:
- name: "Cleanup repo"
shell: bash
@@ -107,19 +106,16 @@ jobs:
CHICKEN_EGG_PROVIDERS: ${{ inputs.chicken-egg-providers }}
run: >
breeze release-management prepare-provider-distributions
--include-not-ready-providers
- --distribution-format wheel --version-suffix-for-pypi dev0
- ${CHICKEN_EGG_PROVIDERS}
+ --distribution-format wheel ${CHICKEN_EGG_PROVIDERS}
if: inputs.chicken-egg-providers != ''
- name: "Prepare airflow distributions"
shell: bash
run: >
- breeze release-management prepare-airflow-distributions
- --distribution-format wheel --version-suffix-for-pypi dev0
+ breeze release-management prepare-airflow-distributions
--distribution-format wheel
- name: "Prepare task-sdk distribution"
shell: bash
run: >
- breeze release-management prepare-task-sdk-distributions
- --distribution-format wheel --version-suffix-for-pypi dev0
+ breeze release-management prepare-task-sdk-distributions
--distribution-format wheel
- name: "PyPI constraints"
shell: bash
timeout-minutes: 25
diff --git a/.github/workflows/prod-image-build.yml
b/.github/workflows/prod-image-build.yml
index a335576d4bc..27bf6467377 100644
--- a/.github/workflows/prod-image-build.yml
+++ b/.github/workflows/prod-image-build.yml
@@ -126,7 +126,6 @@ jobs:
if: inputs.prod-image-build == 'true'
env:
PYTHON_MAJOR_MINOR_VERSION: "${{ inputs.default-python-version }}"
- VERSION_SUFFIX_FOR_PYPI: ${{ inputs.branch == 'main' && 'dev0' || '' }}
steps:
- name: "Cleanup repo"
shell: bash
@@ -153,7 +152,7 @@ jobs:
run: >
breeze release-management prepare-provider-distributions
--distributions-list-file ./prod_image_installed_providers.txt
- --distribution-format wheel --include-not-ready-providers
+ --distribution-format wheel --include-not-ready-providers
--skip-tag-check
if: >
inputs.upload-package-artifact == 'true' &&
inputs.build-provider-distributions == 'true'
@@ -206,7 +205,6 @@ jobs:
PYTHON_MAJOR_MINOR_VERSION: "${{ matrix.python-version }}"
DEFAULT_BRANCH: ${{ inputs.branch }}
DEFAULT_CONSTRAINTS_BRANCH: ${{ inputs.constraints-branch }}
- VERSION_SUFFIX_FOR_PYPI: ${{ inputs.branch == 'main' && 'dev0' || '' }}
INCLUDE_NOT_READY_PROVIDERS: "true"
# You can override CONSTRAINTS_GITHUB_REPOSITORY by setting secret in
your repo but by default the
# Airflow one is going to be used
diff --git a/.github/workflows/push-image-cache.yml
b/.github/workflows/push-image-cache.yml
index cf8097cebd7..ba16ac4fcb3 100644
--- a/.github/workflows/push-image-cache.yml
+++ b/.github/workflows/push-image-cache.yml
@@ -116,7 +116,6 @@ jobs:
PYTHON_MAJOR_MINOR_VERSION: "${{ matrix.python }}"
UPGRADE_TO_NEWER_DEPENDENCIES: "false"
VERBOSE: "true"
- VERSION_SUFFIX_FOR_PYPI: "dev0"
steps:
- name: "Cleanup repo"
shell: bash
@@ -191,7 +190,6 @@ jobs:
PYTHON_MAJOR_MINOR_VERSION: "${{ matrix.python }}"
UPGRADE_TO_NEWER_DEPENDENCIES: "false"
VERBOSE: "true"
- VERSION_SUFFIX_FOR_PYPI: "dev0"
if: inputs.include-prod-images == 'true'
steps:
- name: "Cleanup repo"
diff --git a/.github/workflows/release_dockerhub_image.yml
b/.github/workflows/release_dockerhub_image.yml
index c850bef5808..d94efa2c126 100644
--- a/.github/workflows/release_dockerhub_image.yml
+++ b/.github/workflows/release_dockerhub_image.yml
@@ -153,8 +153,7 @@ jobs:
CHICKEN_EGG_PROVIDERS: ${{
needs.build-info.outputs.chicken-egg-providers }}
run: >
breeze release-management prepare-provider-distributions
- --distribution-format wheel
- --version-suffix-for-pypi rc1 ${CHICKEN_EGG_PROVIDERS}
+ --distribution-format wheel ${CHICKEN_EGG_PROVIDERS}
if: needs.build-info.outputs.chicken-egg-providers != ''
- name: "Copy dist packages to docker-context files"
shell: bash
diff --git a/.github/workflows/test-providers.yml
b/.github/workflows/test-providers.yml
index 39f96b2c89a..9775df78061 100644
--- a/.github/workflows/test-providers.yml
+++ b/.github/workflows/test-providers.yml
@@ -104,14 +104,14 @@ jobs:
- name: "Prepare provider distributions: ${{ matrix.package-format }}"
run: >
breeze release-management prepare-provider-distributions
--include-not-ready-providers
- --version-suffix-for-pypi dev0 --distribution-format ${{
matrix.package-format }}
+ --skip-tag-check --distribution-format ${{ matrix.package-format }}
- name: "Prepare airflow package: ${{ matrix.package-format }}"
run: >
- breeze release-management prepare-airflow-distributions
--version-suffix-for-pypi dev0
+ breeze release-management prepare-airflow-distributions
--distribution-format ${{ matrix.package-format }}
- name: "Prepare task-sdk package: ${{ matrix.package-format }}"
run: >
- breeze release-management prepare-task-sdk-distributions
--version-suffix-for-pypi dev0
+ breeze release-management prepare-task-sdk-distributions
--distribution-format ${{ matrix.package-format }}
- name: "Verify ${{ matrix.package-format }} packages with twine"
run: |
@@ -175,7 +175,6 @@ jobs:
GITHUB_USERNAME: ${{ github.actor }}
INCLUDE_NOT_READY_PROVIDERS: "true"
PYTHON_MAJOR_MINOR_VERSION: "${{ matrix.compat.python-version }}"
- VERSION_SUFFIX_FOR_PYPI: "dev0"
VERBOSE: "true"
CLEAN_AIRFLOW_INSTALLATION: "true"
if: inputs.skip-providers-tests != 'true'
@@ -198,7 +197,7 @@ jobs:
- name: "Prepare provider distributions: wheel"
run: >
breeze release-management prepare-provider-distributions
--include-not-ready-providers
- --distribution-format wheel
+ --distribution-format wheel --skip-tag-check
# yamllint disable rule:line-length
- name: Remove incompatible Airflow ${{ matrix.compat.airflow-version
}}:Python ${{ matrix.compat.python-version }} provider distributions
env:
diff --git a/contributing-docs/testing/python_client_tests.rst
b/contributing-docs/testing/python_client_tests.rst
index f86b7d0e153..9731fc3dd36 100644
--- a/contributing-docs/testing/python_client_tests.rst
+++ b/contributing-docs/testing/python_client_tests.rst
@@ -44,4 +44,4 @@ To build the package, you can run the following command:
.. code-block:: bash
breeze release-management prepare-python-client --distribution-format both
- --version-suffix-for-pypi dev0 --python-client-repo
./airflow-client-python
+ --python-client-repo ./airflow-client-python
diff --git a/contributing-docs/testing/unit_tests.rst
b/contributing-docs/testing/unit_tests.rst
index 1ee818b060a..f6d6d9c4509 100644
--- a/contributing-docs/testing/unit_tests.rst
+++ b/contributing-docs/testing/unit_tests.rst
@@ -1175,7 +1175,7 @@ Herr id how to reproduce it.
rm dist/*
breeze release-management prepare-provider-distributions
--include-not-ready-providers \
- --version-suffix-for-pypi dev0 --distribution-format wheel
+ --skip-tag-check --distribution-format wheel
3. Prepare provider constraints
@@ -1225,7 +1225,7 @@ Rebuilding single provider package can be done using this
command:
.. code-block:: bash
breeze release-management prepare-provider-distributions \
- --version-suffix-for-pypi dev0 --distribution-format wheel <provider>
+ --skip-tag-check --distribution-format wheel <provider>
Lowest direct dependency resolution tests
-----------------------------------------
diff --git a/dev/breeze/doc/05_test_commands.rst
b/dev/breeze/doc/05_test_commands.rst
index 63f6a502202..b8edd42bb66 100644
--- a/dev/breeze/doc/05_test_commands.rst
+++ b/dev/breeze/doc/05_test_commands.rst
@@ -247,7 +247,7 @@ To package the client, clone the airflow-python-client
repository and run the fo
.. code-block:: bash
breeze release-management prepare-python-client --distribution-format both
- --version-suffix-for-pypi dev0 --python-client-repo
./airflow-client-python
+ --python-client-repo ./airflow-client-python
.. code-block:: bash
diff --git a/dev/refresh_images.sh b/dev/refresh_images.sh
index de69549ff2b..5ac46d74f9a 100755
--- a/dev/refresh_images.sh
+++ b/dev/refresh_images.sh
@@ -41,9 +41,9 @@ done
#breeze release-management prepare-provider-distributions \
# --distributions-list-file ./prod_image_installed_providers.txt \
# --distribution-format wheel \
-# --version-suffix-for-pypi dev0
+# --skip-tag-check
#
-##breeze release-management prepare-airflow-distributions
--distribution-format wheel --version-suffix-for-pypi dev0
+##breeze release-management prepare-airflow-distributions
--distribution-format wheel --skip-tag-check
#
#mv -v ./dist/*.whl ./docker-context-files && chmod a+r
./docker-context-files/*
#
