From 11b60141133040252d5412d810220ad02a25f493 Mon Sep 17 00:00:00 2001 From: Jarek Potiuk Date: Thu, 18 Aug 2022 01:46:24 +0200 Subject: [PATCH] Revert "Help pip resolved to make better decisions on Pyarrow version (#25697)" (#25777) This reverts commit 1b84048a15c108a210a0a8c809ae85532c667449. --- Dockerfile | 4 +--- Dockerfile.ci | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0dfade43b25a1..273f8de939070 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1218,9 +1218,7 @@ 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 -# * 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 EAGER_UPGRADE_ADDITIONAL_REQUIREMENTS="dill<0.3.3" ENV ADDITIONAL_PYTHON_DEPS=${ADDITIONAL_PYTHON_DEPS} \ INSTALL_PACKAGES_FROM_CONTEXT=${INSTALL_PACKAGES_FROM_CONTEXT} \ diff --git a/Dockerfile.ci b/Dockerfile.ci index fdc2b554f3eff..fe2a253ee1476 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -1175,9 +1175,7 @@ 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 -# * 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 EAGER_UPGRADE_ADDITIONAL_REQUIREMENTS="dill<0.3.3" ARG UPGRADE_TO_NEWER_DEPENDENCIES="false" ENV EAGER_UPGRADE_ADDITIONAL_REQUIREMENTS=${EAGER_UPGRADE_ADDITIONAL_REQUIREMENTS} \ UPGRADE_TO_NEWER_DEPENDENCIES=${UPGRADE_TO_NEWER_DEPENDENCIES}