Skip to content

Commit

Permalink
Remove requests limits and restore opensearch tests for latest boto
Browse files Browse the repository at this point in the history
The requests limits were removing opensearch during "latest boto"
tests but this is not needed any more, since apache.beam latest
version already supports requests 2.32.*. That also unblocks moving
opensearch to a separate provider project.
  • Loading branch information
potiuk committed Jan 30, 2025
1 parent 63d3602 commit 93cad0e
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 18 deletions.
9 changes: 1 addition & 8 deletions Dockerfile.ci
Original file line number Diff line number Diff line change
Expand Up @@ -935,17 +935,10 @@ function check_boto_upgrade() {
# We need to include few dependencies to pass pip check with other dependencies:
# * oss2 as dependency as otherwise jmespath will be bumped (sync with alibaba provider)
# * cryptography is kept for snowflake-connector-python limitation (sync with snowflake provider)
# * requests needs to be limited to be compatible with apache beam (sync with apache-beam provider)
# * yandexcloud requirements for requests does not match those of apache.beam and latest botocore
# Both requests and yandexcloud exclusion above might be removed after
# https://github.com/apache/beam/issues/32080 is addressed
# This is already addressed and planned for 2.59.0 release.
# When you remove yandexcloud and opensearch from the above list, you can also remove the
# optional providers_dependencies exclusions from "test_example_dags.py" in "tests/always".
set -x
# shellcheck disable=SC2086
${PACKAGING_TOOL_CMD} install ${EXTRA_INSTALL_FLAGS} --upgrade boto3 botocore \
"oss2>=2.14.0" "cryptography<43.0.0" "requests!=2.32.*,<3.0.0,>=2.24.0"
"oss2>=2.14.0" "cryptography<43.0.0" "opensearch-py"
set +x
pip check
}
Expand Down
9 changes: 1 addition & 8 deletions scripts/docker/entrypoint_ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -255,17 +255,10 @@ function check_boto_upgrade() {
# We need to include few dependencies to pass pip check with other dependencies:
# * oss2 as dependency as otherwise jmespath will be bumped (sync with alibaba provider)
# * cryptography is kept for snowflake-connector-python limitation (sync with snowflake provider)
# * requests needs to be limited to be compatible with apache beam (sync with apache-beam provider)
# * yandexcloud requirements for requests does not match those of apache.beam and latest botocore
# Both requests and yandexcloud exclusion above might be removed after
# https://github.com/apache/beam/issues/32080 is addressed
# This is already addressed and planned for 2.59.0 release.
# When you remove yandexcloud and opensearch from the above list, you can also remove the
# optional providers_dependencies exclusions from "test_example_dags.py" in "tests/always".
set -x
# shellcheck disable=SC2086
${PACKAGING_TOOL_CMD} install ${EXTRA_INSTALL_FLAGS} --upgrade boto3 botocore \
"oss2>=2.14.0" "cryptography<43.0.0" "requests!=2.32.*,<3.0.0,>=2.24.0"
"oss2>=2.14.0" "cryptography<43.0.0" "opensearch-py"
set +x
pip check
}
Expand Down
3 changes: 1 addition & 2 deletions tests/always/test_example_dags.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@
# The format of the dictionary is as follows:
# key: the regexp matching the file to be excluded,
# value: a dictionary containing package distributions with an optional version specifier, e.g., >=2.3.4
".*example_bedrock_retrieve_and_generate.py": {"opensearch-py": None},
".*example_opensearch.py": {"opensearch-py": None},
# yandexcloud is automatically removed in case botocore is upgraded to latest
r".*example_yandexcloud.*\.py": {"yandexcloud": None},
}
IGNORE_AIRFLOW_PROVIDER_DEPRECATION_WARNING: tuple[str, ...] = (
Expand Down

0 comments on commit 93cad0e

Please sign in to comment.