From fa5338d3bd3e9919aaaeefd8ddadc80876eb5fe5 Mon Sep 17 00:00:00 2001 From: Madison Swain-Bowden Date: Mon, 15 Aug 2022 14:22:01 -0700 Subject: [PATCH 1/2] Upgrade Airflow to v2.3.3 --- docker/airflow/Dockerfile | 4 ++-- requirements_prod.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/airflow/Dockerfile b/docker/airflow/Dockerfile index 7bb90680b..12aee757b 100644 --- a/docker/airflow/Dockerfile +++ b/docker/airflow/Dockerfile @@ -39,14 +39,14 @@ RUN useradd -m -d ${AIRFLOW_HOME} airflow && \ chown airflow:airflow ${OUTPUT_DIR} USER airflow -ARG AIRFLOW_VERSION=2.3.0 +ARG AIRFLOW_VERSION=2.3.3 WORKDIR ${AIRFLOW_HOME} # Always add the prod req because the dev reqs depend on it for deduplication COPY ${REQUIREMENTS_FILE} requirements_prod.txt ${AIRFLOW_HOME}/ COPY docker/airflow/wait_for_db.py /opt/airflow/ # https://airflow.apache.org/docs/apache-airflow/stable/installation/installing-from-pypi.html#constraints-files -ARG CONSTRAINTS_FILE="https://raw.githubusercontent.com/apache/airflow/constraints-${AIRFLOW_VERSION}/constraints-3.9.txt" +ARG CONSTRAINTS_FILE="https://raw.githubusercontent.com/apache/airflow/constraints-${AIRFLOW_VERSION}/constraints-3.10.txt" RUN pip install --user -r ${REQUIREMENTS_FILE} -c ${CONSTRAINTS_FILE} diff --git a/requirements_prod.txt b/requirements_prod.txt index c3f17603a..bfb8a6231 100644 --- a/requirements_prod.txt +++ b/requirements_prod.txt @@ -1,4 +1,4 @@ -apache-airflow[amazon,postgres,http]==2.3.0 +apache-airflow[amazon,postgres,http]==2.3.3 lxml psycopg2-binary requests-file==1.5.1 From 192cbdece09ba3b2d9e1e16de08208051a83d253 Mon Sep 17 00:00:00 2001 From: Madison Swain-Bowden Date: Mon, 15 Aug 2022 14:31:52 -0700 Subject: [PATCH 2/2] Add note about warning capture --- .../dags/common/sensors/test_single_run_external_dags_sensor.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/dags/common/sensors/test_single_run_external_dags_sensor.py b/tests/dags/common/sensors/test_single_run_external_dags_sensor.py index 702f476c1..6f5d206c8 100644 --- a/tests/dags/common/sensors/test_single_run_external_dags_sensor.py +++ b/tests/dags/common/sensors/test_single_run_external_dags_sensor.py @@ -111,6 +111,7 @@ def test_fails_if_external_dag_missing_sensor_task(self): # TODO: warnings for...(drumroll) Airflow operators 🙃 hopefully this is # TODO: fixed in 2.2.5 or something. # TODO: Update: 2022-05-06/v2.3.0, still an issue! + # TODO: Update: 2022-08-15/v2.3.3, Still an issue (MJSB) warnings.simplefilter("ignore", category=DeprecationWarning) dagbag = DagBag(dag_folder=DEV_NULL, include_examples=True) bash_dag = dagbag.dags["example_bash_operator"]