This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch fix-failing-sqlalchemy-test
in repository https://gitbox.apache.org/repos/asf/airflow.git
commit 3832ead22158ed963417367082868f5563f8f734
Author: Jarek Potiuk <ja...@potiuk.com>
AuthorDate: Mon Mar 25 02:11:39 2024 +0100
Fix failing MinSQLAlchemy test after moving sqlalchemy spec
Ths MIN SQLACLHEMY test was based on retrieving sqlalchemy min
version from pyproject.toml but since we moved it to hatch_build.py
we should read it from there.
---
.github/workflows/run-unit-tests.yml | 2 +-
Dockerfile.ci | 12 ++++++------
scripts/docker/entrypoint_ci.sh | 12 ++++++------
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/.github/workflows/run-unit-tests.yml
b/.github/workflows/run-unit-tests.yml
index 4f72ff3c01..ef7f86b481 100644
--- a/.github/workflows/run-unit-tests.yml
+++ b/.github/workflows/run-unit-tests.yml
@@ -126,7 +126,7 @@ jobs:
BACKEND_VERSION: "${{ matrix.backend-version }}"
DEBUG_RESOURCES: "${{ inputs.debug-resources }}"
DOWNGRADE_SQLALCHEMY: "${{ inputs.downgrade-sqlalchemy }}"
- DOWN_PENDULUM: "${{ inputs.downgrade-pendulum }}"
+ DOWNGRADE_PENDULUM: "${{ inputs.downgrade-pendulum }}"
ENABLE_COVERAGE: "${{ inputs.run-coverage }}"
IMAGE_TAG: "${{ inputs.image-tag }}"
INCLUDE_SUCCESS_OUTPUTS: ${{ inputs.include-success-outputs }}
diff --git a/Dockerfile.ci b/Dockerfile.ci
index 03c5bbb4e7..3c0e0f2932 100644
--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@@ -1049,11 +1049,11 @@ function check_pydantic() {
}
-function check_download_sqlalchemy() {
+function check_downgrade_sqlalchemy() {
if [[ ${DOWNGRADE_SQLALCHEMY=} != "true" ]]; then
return
fi
- min_sqlalchemy_version=$(grep "\"sqlalchemy>=" pyproject.toml | sed
"s/.*>=\([0-9\.]*\).*/\1/" | xargs)
+ min_sqlalchemy_version=$(grep "\"sqlalchemy>=" hatch_build.py | sed
"s/.*>=\([0-9\.]*\).*/\1/" | xargs)
echo
echo "${COLOR_BLUE}Downgrading sqlalchemy to minimum supported version:
${min_sqlalchemy_version}${COLOR_RESET}"
echo
@@ -1062,11 +1062,11 @@ function check_download_sqlalchemy() {
pip check
}
-function check_download_pendulum() {
+function check_downgrade_pendulum() {
if [[ ${DOWNGRADE_PENDULUM=} != "true" ]]; then
return
fi
- min_pendulum_version=$(grep "\"pendulum>=" pyproject.toml | sed
"s/.*>=\([0-9\.]*\).*/\1/" | xargs)
+ min_pendulum_version=$(grep "\"pendulum>=" hatch_build.py | sed
"s/.*>=\([0-9\.]*\).*/\1/" | xargs)
echo
echo "${COLOR_BLUE}Downgrading pendulum to minimum supported version:
${min_pendulum_version}${COLOR_RESET}"
echo
@@ -1104,8 +1104,8 @@ determine_airflow_to_use
environment_initialization
check_boto_upgrade
check_pydantic
-check_download_sqlalchemy
-check_download_pendulum
+check_downgrade_sqlalchemy
+check_downgrade_pendulum
check_run_tests "${@}"
exec /bin/bash "${@}"
diff --git a/scripts/docker/entrypoint_ci.sh b/scripts/docker/entrypoint_ci.sh
index 2792035d7f..8b2ec5c09f 100755
--- a/scripts/docker/entrypoint_ci.sh
+++ b/scripts/docker/entrypoint_ci.sh
@@ -271,11 +271,11 @@ function check_pydantic() {
# Download minimum supported version of sqlalchemy to run tests with it
-function check_download_sqlalchemy() {
+function check_downgrade_sqlalchemy() {
if [[ ${DOWNGRADE_SQLALCHEMY=} != "true" ]]; then
return
fi
- min_sqlalchemy_version=$(grep "\"sqlalchemy>=" pyproject.toml | sed
"s/.*>=\([0-9\.]*\).*/\1/" | xargs)
+ min_sqlalchemy_version=$(grep "\"sqlalchemy>=" hatch_build.py | sed
"s/.*>=\([0-9\.]*\).*/\1/" | xargs)
echo
echo "${COLOR_BLUE}Downgrading sqlalchemy to minimum supported version:
${min_sqlalchemy_version}${COLOR_RESET}"
echo
@@ -285,11 +285,11 @@ function check_download_sqlalchemy() {
}
# Download minimum supported version of pendulum to run tests with it
-function check_download_pendulum() {
+function check_downgrade_pendulum() {
if [[ ${DOWNGRADE_PENDULUM=} != "true" ]]; then
return
fi
- min_pendulum_version=$(grep "\"pendulum>=" pyproject.toml | sed
"s/.*>=\([0-9\.]*\).*/\1/" | xargs)
+ min_pendulum_version=$(grep "\"pendulum>=" hatch_build.py | sed
"s/.*>=\([0-9\.]*\).*/\1/" | xargs)
echo
echo "${COLOR_BLUE}Downgrading pendulum to minimum supported version:
${min_pendulum_version}${COLOR_RESET}"
echo
@@ -328,8 +328,8 @@ determine_airflow_to_use
environment_initialization
check_boto_upgrade
check_pydantic
-check_download_sqlalchemy
-check_download_pendulum
+check_downgrade_sqlalchemy
+check_downgrade_pendulum
check_run_tests "${@}"
# If we are not running tests - just exec to bash shell
