Bump versions too

godatadriven · May 16, 2024 · 52c9c9e · 52c9c9e
1 parent 23fddbb
commit 52c9c9e
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 15 deletions.
diff --git a/.github/workflows/whirl-ci.yml b/.github/workflows/whirl-ci.yml
@@ -47,8 +47,8 @@ jobs:
       max-parallel: 4
       matrix:
         example_dir: ${{ fromJson(needs.directories.outputs.dir) }}
-        python_version: ["3.8", "3.9"]
-        airflow_version: ["2.2.5", "2.7.2"]
+        python_version: ["3.8", "3.12"]
+        airflow_version: ["2.2.5", "2.9.1"]
         exclude:
           # Needs more memory than available on the runner
           - example_dir: ./examples/dbt-spark-example
@@ -75,8 +75,8 @@ jobs:
       max-parallel: 4
       matrix:
         example: ${{ fromJson(needs.examples.outputs.example) }}
-        python_version: ["3.8", "3.9"]
-        airflow_version: ["2.2.5", "2.7.2"]
+        python_version: ["3.8", "3.12"]
+        airflow_version: ["2.2.5", "2.9.1"]
         exclude:
           # Needs more memory than available on the runner
           - example: dbt-spark-example
@@ -100,8 +100,8 @@ jobs:
       fail-fast: false
       max-parallel: 1
       matrix:
-        python_version: ["3.8", "3.9"]
-        airflow_version: ["2.2.5", "2.7.2"]
+        python_version: ["3.8", "3.12"]
+        airflow_version: ["2.2.5", "2.9.1"]
     env:
       PYTHON_VERSION: ${{ matrix.python_version }}
       AIRFLOW_VERSION: ${{ matrix.airflow_version }}
@@ -128,8 +128,8 @@ jobs:
       fail-fast: false
       max-parallel: 4
       matrix:
-        python_version: ["3.8", "3.9"]
-        airflow_version: ["2.2.5", "2.7.2"]
+        python_version: ["3.8", "3.12"]
+        airflow_version: ["2.2.5", "2.9.1"]
     runs-on: ubuntu-latest
     env:
       PYTHON_VERSION: ${{ matrix.python_version }}
@@ -147,8 +147,8 @@ jobs:
       fail-fast: false
       max-parallel: 4
       matrix:
-        python_version: ["3.8", "3.9"]
-        airflow_version: ["2.2.5", "2.7.2"]
+        python_version: ["3.8", "3.12"]
+        airflow_version: ["2.2.5", "2.9.1"]
     runs-on: ubuntu-latest
     env:
       PYTHON_VERSION: ${{ matrix.python_version }}

diff --git a/docker/airflow-python/Dockerfile b/docker/airflow-python/Dockerfile
@@ -38,8 +38,7 @@ EXPOSE 5000
 
 COPY --chown=airflow:root entrypoint.sh /entrypoint-whirl.sh
 COPY includes /etc/airflow/functions
-COPY pip.conf /home/airflow/.config/pip/pip.conf
 
 ENV PATH="${PATH}:/home/airflow/.local/bin"
 ENTRYPOINT ["/entrypoint-whirl.sh"]
-CMD ["airflow", "--help"]
+CMD ["airflow", "--help"]
diff --git a/docker/airflow-python/pip.conf b/docker/airflow-python/pip.conf
diff --git a/envs/just-airflow/.whirl.env b/envs/just-airflow/.whirl.env
@@ -1,3 +1,5 @@
+AIRFLOW_VERSION=2.9.1
+
 # Airflow variables
 AIRFLOW__CORE__EXPOSE_CONFIG=True
 AIRFLOW__WEBSERVER__EXPOSE_CONFIG=True

diff --git a/examples/airflow-datasets/.whirl.env b/examples/airflow-datasets/.whirl.env
@@ -1 +1,4 @@
+AIRFLOW_VERSION=2.9.1
+PYTHON_VERSION=3.11
+
 WHIRL_ENVIRONMENT=api-s3-dataset
diff --git a/examples/airflow-timetable/whirl.setup.d/01_install_custom_timetable.sh b/examples/airflow-timetable/whirl.setup.d/01_install_custom_timetable.sh
@@ -4,4 +4,5 @@ echo "==============================="
 echo "== Install timetable plugins =="
 echo "==============================="
 
-pip install ${WHIRL_SETUP_FOLDER}/dag.d/plugins
+mkdir -p /tmp/custom_build
+pip install ${WHIRL_SETUP_FOLDER}/dag.d/plugins