Merge pull request #6685 from Flowminder/Bump-Airflow-to-2.9.2

Update flowetl.Dockerfile

Author: mergify[bot]

.circleci/config.yml

@@ -681,6 +681,7 @@ jobs:
           name: Install python dependencies
           # Touching requirements files here so that make doesn't rebuild them - we can't rely on file timestamps in a fresh repo clone
           command: |
+            pyenv update
             touch requirements.txt dev-requirements.txt
             make CI=true dev-sync
       - save_cache:
@@ -701,7 +702,7 @@ jobs:
 
   run_flowetl_integration_tests:
     machine:
-      image: ubuntu-2004:2023.10.1
+      image: ubuntu-2404:2024.05.1
     environment:
       AIRFLOW_HOME: ./test_airflow_home
       FLOWETL_RUNTIME_CONFIG: "testing"

CHANGELOG.md

@@ -17,6 +17,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - FlowETL now attached new data as partitions, rather than subtables
 > [!WARNING]
 > This change is not backwards compatible with earlier releases of FlowDB, and you will need to repopulate your deployment. We recommend combining this change with the new parquet support.
+- FlowETL is now built on Airflow 2.9.2
 
 ### Fixed
 

flowetl.Dockerfile

@@ -6,7 +6,7 @@
 #  FLOWETL
 #  -----
 
-FROM apache/airflow:2.8.4-python3.10@sha256:56dbeebae776b82fa2b0a3772fd8c3ca86f4760f3c9c8b652e1dc84aefec3be9
+FROM apache/airflow:2.9.2-python3.10@sha256:6d458e8ee963eefe3c05f6484bc22a004363db84acf500d5bfd5595980b7021c
 
 ENV AIRFLOW__CORE__DAGS_FOLDER ${AIRFLOW_HOME}/dags
 ENV AIRFLOW__CORE__LOAD_EXAMPLES False
@@ -35,7 +35,7 @@ RUN apt-get update && \
     apt purge -y --auto-remove && \
     rm -rf /var/lib/apt/lists/*
 USER airflow
-RUN cd flowetl && pip install --no-deps --no-cache-dir --user .
+RUN cd flowetl && pip install --no-deps --no-cache-dir .
 
 
 WORKDIR ${AIRFLOW_HOME}

flowetl/.airflow-version

@@ -1 +1 @@
-2.8.4
+2.9.2

flowetl/.python-version

@@ -1 +1 @@
-3.10.13
+3.10.14

flowetl/Makefile

@@ -33,6 +33,8 @@
 #   deep-clean:
 #       Remove virtual environment and compiled requirements files
 
+SHELL := /bin/bash
+
 VENVDIR ?= .venv
 ACTIVATE := source $(VENVDIR)/bin/activate;
 PIP_COMPILE := pip-compile --strip-extras --generate-hashes --allow-unsafe

flowetl/dev-requirements.txt

@@ -45,7 +45,7 @@
             "docker",
             "versioneer",
             "pytest-cov",
-            "black == 24.3.0",
+            "black",
         ]
     },
     python_requires=">=3.6",