This is an automated email from the ASF dual-hosted git repository. ephraimanierobi pushed a commit to branch v2-3-test in repository https://gitbox.apache.org/repos/asf/airflow.git
commit 184d29ceeaf92314101886913f5b81be3f44ad93 Author: Jarek Potiuk <[email protected]> AuthorDate: Thu Aug 18 17:13:21 2022 +0200 Help pip resolver make better decision on Pyarrow (#25791) (cherry picked from commit c0973cd61e353886fe223e2a335c74afb9fac06c) --- Dockerfile | 4 +++- Dockerfile.ci | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 273f8de939..0dfade43b2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1218,7 +1218,9 @@ ARG ADDITIONAL_PYTHON_DEPS="" # Those are additional constraints that are needed for some extras but we do not want to # Force them on the main Airflow package. # * dill<0.3.3 required by apache-beam -ARG EAGER_UPGRADE_ADDITIONAL_REQUIREMENTS="dill<0.3.3" +# * pyarrow>=6.0.0 is because pip resolver decides for Python 3.10 to downgrade pyarrow to 5 even if it is OK +# for python 3.10 and other dependencies adding the limit helps resolver to make better decisions +ARG EAGER_UPGRADE_ADDITIONAL_REQUIREMENTS="dill<0.3.3 pyarrow>=6.0.0" ENV ADDITIONAL_PYTHON_DEPS=${ADDITIONAL_PYTHON_DEPS} \ INSTALL_PACKAGES_FROM_CONTEXT=${INSTALL_PACKAGES_FROM_CONTEXT} \ diff --git a/Dockerfile.ci b/Dockerfile.ci index 1c059854ad..adbbedfee8 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -1175,7 +1175,9 @@ RUN echo "Airflow version: ${AIRFLOW_VERSION}" # Those are additional constraints that are needed for some extras but we do not want to # force them on the main Airflow package. Those limitations are: # * dill<0.3.3 required by apache-beam -ARG EAGER_UPGRADE_ADDITIONAL_REQUIREMENTS="dill<0.3.3" +# * pyarrow>=6.0.0 is because pip resolver decides for Python 3.10 to downgrade pyarrow to 5 even if it is OK +# for python 3.10 and other dependencies adding the limit helps resolver to make better decisions +ARG EAGER_UPGRADE_ADDITIONAL_REQUIREMENTS="dill<0.3.3 pyarrow>=6.0.0" ARG UPGRADE_TO_NEWER_DEPENDENCIES="false" ENV EAGER_UPGRADE_ADDITIONAL_REQUIREMENTS=${EAGER_UPGRADE_ADDITIONAL_REQUIREMENTS} \ UPGRADE_TO_NEWER_DEPENDENCIES=${UPGRADE_TO_NEWER_DEPENDENCIES}
