diff --git a/dev/README_RELEASE_AIRFLOW.md b/dev/README_RELEASE_AIRFLOW.md index aa2d6296a4b99..ccecbd9aaa3bf 100644 --- a/dev/README_RELEASE_AIRFLOW.md +++ b/dev/README_RELEASE_AIRFLOW.md @@ -386,7 +386,7 @@ are encouraged to test the release and vote with "(non-binding)". The test procedure for PMC members is described in: https://github.com/apache/airflow/blob/main/dev/README_RELEASE_AIRFLOW.md#verify-the-release-candidate-by-pmc-members -The test procedure for and Contributors who would like to test this RC is described in: +The test procedure for contributors and members of the community who would like to test this RC is described in: https://github.com/apache/airflow/blob/main/dev/README_RELEASE_AIRFLOW.md#verify-the-release-candidate-by-contributors diff --git a/dev/README_RELEASE_PYTHON_CLIENT.md b/dev/README_RELEASE_PYTHON_CLIENT.md index e002661e4546b..1130762d9caa7 100644 --- a/dev/README_RELEASE_PYTHON_CLIENT.md +++ b/dev/README_RELEASE_PYTHON_CLIENT.md @@ -66,7 +66,7 @@ cd .. ```bash # If you have not done so yet -git clone git@github.com/apache/airflow-client-python +git clone git@github.com:apache/airflow-client-python cd airflow-client-python # Checkout the right branch git checkout main @@ -80,8 +80,8 @@ cd .. ```bash cd ${AIRFLOW_REPO_ROOT} -VERSION="2.8.0" -VERSION_SUFFIX="rc1" +export VERSION="2.8.0" +export VERSION_SUFFIX="rc1" echo "${VERSION}" > clients/python/version.txt ``` @@ -101,21 +101,6 @@ git log 2.8.0..HEAD --pretty=oneline -- airflow/api_connexion/openapi/v1.yaml - Merge it to the `v2-*-stable` branch. You will release API client from the latest `v2-*-stable` branch of Airflow repository - same branch that is used to release Airflow. -- Tag your release with RC candidate tag (note that this is the RC tag even if version of the packages - is the same as the final version. This is because when the packages get approved and released they - will turn into official release and must be binary identical to the RC packages in SVN). The tags - should be set in both Airflow and Airflow Client repositories (with python-client prefix in Airflow repo and - without the prefix in the Python Client repo). - -```shell script -cd ${AIRFLOW_REPO_ROOT} -git tag -s python-client-${VERSION}${VERSION_SUFFIX} -m "Airflow Python Client ${VERSION}${VERSION_SUFFIX}" -git push apache python-client-${VERSION}${VERSION_SUFFIX} -cd ${CLIENT__REPO_ROOT} -git tag -s ${VERSION}${VERSION_SUFFIX} -m "Airflow Python Client ${VERSION}${VERSION_SUFFIX}" -git push apache ${VERSION}${VERSION_SUFFIX} -``` - - Build the sdist and wheel packages to be added to SVN and copy generated client sources to the Python Client repository. @@ -135,11 +120,30 @@ breeze release-management prepare-python-client --package-format both --python-c ```shell script cd ${CLIENT_REPO_ROOT} git diff HEAD +git checkout -b release-${VERSION} git add . git commit -m "Update Python Client to ${VERSION}${VERSION_SUFFIX}" -git push origin main +git push apache release-${VERSION} ``` +Then open a PR and merge it into main. + +- Tag your release with RC candidate tag (note that this is the RC tag even if version of the packages + is the same as the final version. This is because when the packages get approved and released they + will turn into official release and must be binary identical to the RC packages in SVN). The tags + should be set in both Airflow and Airflow Client repositories (with python-client prefix in Airflow repo and + without the prefix in the Python Client repo). + +```shell script +cd ${AIRFLOW_REPO_ROOT} +git tag -s python-client-${VERSION}${VERSION_SUFFIX} -m "Airflow Python Client ${VERSION}${VERSION_SUFFIX}" +git push apache python-client-${VERSION}${VERSION_SUFFIX} +cd ${CLIENT_REPO_ROOT} +git tag -s ${VERSION}${VERSION_SUFFIX} -m "Airflow Python Client ${VERSION}${VERSION_SUFFIX}" +git push apache ${VERSION}${VERSION_SUFFIX} +``` + + - Generate signatures and checksum files for the packages (if you have not generated a key yet, generate it by following instructions on http://www.apache.org/dev/openpgp.html#key-gen-generate-key) @@ -203,7 +207,7 @@ Subject: ```shell script cat <