diff --git a/dev/README_RELEASE_AIRFLOW.md b/dev/README_RELEASE_AIRFLOW.md index df5ee7e3317fb..70baa5ab08f12 100644 --- a/dev/README_RELEASE_AIRFLOW.md +++ b/dev/README_RELEASE_AIRFLOW.md @@ -756,6 +756,7 @@ As a PMC member, you should be able to clone the SVN repository or update it if you already checked it out: ```shell script +cd ${AIRFLOW_REPO_ROOT} cd .. [ -d asf-dist ] || svn checkout --depth=immediates https://dist.apache.org/repos/dist asf-dist svn update --set-depth=infinity asf-dist/dev/airflow @@ -772,12 +773,12 @@ Optionally you can use the `breeze release-management check-release-files` comma present in SVN. This command may also help with verifying installation of the packages. ```shell script -breeze release-management check-release-files airflow --version ${VERSION_RC} --path-to-airflow-svn "${PATH_TO_AIRFLOW_SVN}" +breeze release-management check-release-files airflow --version ${VERSION_RC} ``` ```shell script -breeze release-management check-release-files task-sdk --version ${TASK_SDK_VERSION_RC} --path-to-airflow-svn "${PATH_TO_AIRFLOW_SVN}/task-sdk" +breeze release-management check-release-files task-sdk --version ${TASK_SDK_VERSION_RC} ``` ## Licence check diff --git a/dev/breeze/src/airflow_breeze/commands/release_management_commands.py b/dev/breeze/src/airflow_breeze/commands/release_management_commands.py index 0d8e09f7a8cb7..1347125d13a98 100644 --- a/dev/breeze/src/airflow_breeze/commands/release_management_commands.py +++ b/dev/breeze/src/airflow_breeze/commands/release_management_commands.py @@ -4380,7 +4380,7 @@ def check_release_files( if release_type == "airflow": directory = path_to_airflow_svn / version elif release_type == "task-sdk": - directory = path_to_airflow_svn / version + directory = path_to_airflow_svn / "task-sdk" / version elif release_type == "airflow-ctl": directory = path_to_airflow_svn / "airflow-ctl" / version elif release_type == "python-client": @@ -4412,10 +4412,14 @@ def check_release_files( ) elif release_type == "airflow": missing_files = check_airflow_release(files, version) - create_docker(AIRFLOW_DOCKER.format(version), dockerfile_path) + create_docker(AIRFLOW_DOCKER.format(version, version), dockerfile_path) elif release_type == "task-sdk": missing_files = check_task_sdk_release(files, version) - create_docker(TASK_SDK_DOCKER.format(version), dockerfile_path) + airflow_version = version.replace("1", "3", 1) + create_docker( + TASK_SDK_DOCKER.format(version, airflow_version, airflow_version, airflow_version), + dockerfile_path, + ) elif release_type == "airflow-ctl": missing_files = check_airflow_ctl_release(files, version) create_docker(AIRFLOW_CTL_DOCKER.format(version), dockerfile_path) diff --git a/dev/breeze/src/airflow_breeze/utils/check_release_files.py b/dev/breeze/src/airflow_breeze/utils/check_release_files.py index e5143e64b0ec5..8c64a413763fc 100644 --- a/dev/breeze/src/airflow_breeze/utils/check_release_files.py +++ b/dev/breeze/src/airflow_breeze/utils/check_release_files.py @@ -33,16 +33,16 @@ AIRFLOW_DOCKER = """\ FROM python:3.10 -# Upgrade -RUN pip install "apache-airflow=={}" +RUN pip install "apache-airflow=={}" \ + --constraint "https://raw.githubusercontent.com/apache/airflow/constraints-{}/constraints-3.10.txt" """ TASK_SDK_DOCKER = """\ FROM python:3.10 -# Upgrade -RUN pip install "apache-airflow-task-sdk=={}" +RUN pip install "apache-airflow-task-sdk=={}" "apache-airflow-core=={}" "apache-airflow=={}"\ + --constraint "https://raw.githubusercontent.com/apache/airflow/constraints-{}/constraints-3.10.txt" """