Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Airflow and dependencies #93

Merged
merged 1 commit into from
Jul 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM apache/airflow:2.9.2-python3.12
FROM apache/airflow:2.9.3-python3.12

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was wondering if it would be living too dangerously to install the latest version?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Upgrading Airflow feels like upgrading Rails to me. Do we upgrade patch version automatically there but not minor?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know some upgrades are a more manual process.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll go ahead and merge this but open to figuring out how to loosen up the Airflow upgrade process.

USER root
RUN apt-get update && apt-get install -y gcc git
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
# The following variables are supported:
#
# AIRFLOW_IMAGE_NAME - Docker image name used to run Airflow.
# Default: apache/airflow:2.9.2
# Default: apache/airflow:2.9.3
# AIRFLOW_UID - User ID in Airflow containers
# Default: 50000
# AIRFLOW_PROJ_DIR - Base path to which all the files will be volumed.
Expand All @@ -49,7 +49,7 @@ x-airflow-common:
# In order to add custom dependencies or upgrade provider packages you can use your extended image.
# Comment the image line, place your Dockerfile in the directory where you placed the docker-compose.yaml
# and uncomment the "build" line below, Then run `docker-compose build` to build the images.
#image: ${AIRFLOW_IMAGE_NAME:-apache/airflow:2.9.2}
#image: ${AIRFLOW_IMAGE_NAME:-apache/airflow:2.9.3}
image: ${AIRFLOW_IMAGE_NAME:-suldlss/rialto-airflow:latest}
environment:
&airflow-common-env
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
# The following variables are supported:
#
# AIRFLOW_IMAGE_NAME - Docker image name used to run Airflow.
# Default: apache/airflow:2.9.2
# Default: apache/airflow:2.9.3
# AIRFLOW_UID - User ID in Airflow containers
# Default: 50000
# AIRFLOW_PROJ_DIR - Base path to which all the files will be volumed.
Expand All @@ -49,7 +49,7 @@ x-airflow-common:
# In order to add custom dependencies or upgrade provider packages you can use your extended image.
# Comment the image line, place your Dockerfile in the directory where you placed the docker-compose.yaml
# and uncomment the "build" line below, Then run `docker-compose build` to build the images.
#image: ${AIRFLOW_IMAGE_NAME:-apache/airflow:2.9.2}
# image: ${AIRFLOW_IMAGE_NAME:-apache/airflow:2.9.3}
build: .
environment:
&airflow-common-env
Expand Down
2 changes: 1 addition & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pytest
python-dotenv
ruff
apache-airflow==2.9.2
apache-airflow==2.9.3
18 changes: 9 additions & 9 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ asttokens==2.4.1
# via stack-data
babel==2.15.0
# via sphinx
certifi==2024.6.2
certifi==2024.7.4
# via requests
charset-normalizer==3.3.2
# via requests
Expand All @@ -16,7 +16,7 @@ commonmark==0.9.1
# via recommonmark
decorator==5.1.1
# via ipython
dimcli==1.2
dimcli==1.3
# via rialto-airflow (pyproject.toml)
docutils==0.21.2
# via
Expand All @@ -28,7 +28,7 @@ idna==3.7
# via requests
imagesize==1.4.1
# via sphinx
ipython==8.25.0
ipython==8.26.0
# via dimcli
jedi==0.19.1
# via ipython
Expand All @@ -40,7 +40,7 @@ matplotlib-inline==0.1.7
# via ipython
more-itertools==10.3.0
# via rialto-airflow (pyproject.toml)
numpy==1.26.4
numpy==2.0.1
# via
# dimcli
# pandas
Expand All @@ -64,7 +64,7 @@ prompt-toolkit==3.0.47
# ipython
ptyprocess==0.7.0
# via pexpect
pure-eval==0.2.2
pure-eval==0.2.3
# via stack-data
pyalex==0.14
# via rialto-airflow (pyproject.toml)
Expand Down Expand Up @@ -93,17 +93,17 @@ six==1.16.0
# python-dateutil
snowballstemmer==2.2.0
# via sphinx
sphinx==7.3.7
sphinx==7.4.7
# via recommonmark
sphinxcontrib-applehelp==1.0.8
# via sphinx
sphinxcontrib-devhelp==1.0.6
# via sphinx
sphinxcontrib-htmlhelp==2.0.5
sphinxcontrib-htmlhelp==2.0.6
# via sphinx
sphinxcontrib-jsmath==1.0.1
# via sphinx
sphinxcontrib-qthelp==1.0.7
sphinxcontrib-qthelp==1.0.8
# via sphinx
sphinxcontrib-serializinghtml==1.1.10
# via sphinx
Expand All @@ -117,7 +117,7 @@ traitlets==5.14.3
# matplotlib-inline
tzdata==2024.1
# via pandas
urllib3==2.2.1
urllib3==2.2.2
# via
# pyalex
# requests
Expand Down
Loading