Skip to content

Commit

Permalink
Rename catalog requirements files to match Renovate pattern
Browse files Browse the repository at this point in the history
  • Loading branch information
AetherUnbound committed Dec 13, 2023
1 parent 5f4a991 commit a7a41d1
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions catalog/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ FROM apache/airflow:slim-${CATALOG_AIRFLOW_VERSION}-python${CATALOG_PY_VERSION}
LABEL org.opencontainers.image.source = "https://github.com/WordPress/openverse"

# Build-time arguments, with sensible defaults
ARG REQUIREMENTS_FILE=requirements_prod.txt
ARG REQUIREMENTS_FILE=requirements-prod.txt

# Path configurations
ENV AIRFLOW_HOME=/opt/airflow
Expand Down Expand Up @@ -57,7 +57,7 @@ USER airflow

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 ${REQUIREMENTS_FILE} requirements-prod.txt ${AIRFLOW_HOME}/

# args go out of scope when a new build stage starts so it must be redeclared here
ARG CATALOG_PY_VERSION
Expand Down
6 changes: 3 additions & 3 deletions catalog/justfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ SERVICE := env_var_or_default("SERVICE", "scheduler")
# Version #
###########

export CATALOG_PY_VERSION := `grep '# PYTHON' requirements_prod.txt | awk -F= '{print $2}'`
export CATALOG_AIRFLOW_VERSION := `grep '^apache-airflow' requirements_prod.txt | awk -F= '{print $3}'`
export CATALOG_PY_VERSION := `grep '# PYTHON' requirements-prod.txt | awk -F= '{print $2}'`
export CATALOG_AIRFLOW_VERSION := `grep '^apache-airflow' requirements-prod.txt | awk -F= '{print $3}'`

# Print the required Python version
@py-version:
Expand Down Expand Up @@ -49,7 +49,7 @@ check-py-version:

# Install dependencies
install *args: check-py-version
python -m pip install -r requirements_dev.txt
python -m pip install -r requirements-dev.txt

######
# Up #
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Note: Unpinned packages have their versions determined by the Airflow constraints file

-r requirements_prod.txt
-r requirements-prod.txt

flaky==3.7.0
ipython
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ x-airflow-common: &airflow-common
context: ./catalog/
target: cat
args: # Automatically inferred from env vars, unless specified
- REQUIREMENTS_FILE=requirements_dev.txt
- REQUIREMENTS_FILE=requirements-dev.txt
- CATALOG_PY_VERSION
- CATALOG_AIRFLOW_VERSION
volumes:
Expand Down

0 comments on commit a7a41d1

Please sign in to comment.