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.

Sign up for GitHub

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

Cloud composer python311 upgrade #3680

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Cloud composer python311 upgrade #3680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6abea5
Update calitp-data-infra package dependencies for latest Cloud Compos…
mjumbewu Feb 7, 2025
4c5fbd1
Update airflow requirements for latest cloud composer
mjumbewu Feb 7, 2025
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
4 changes: 2 additions & 2 deletions airflow/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM apache/airflow:2.5.3-python3.8
FROM apache/airflow:2.10.2-python3.11

# install gcloud as root, then switch back to airflow
USER root
Expand All @@ -17,4 +17,4 @@ USER airflow

COPY requirements.txt /tmp/requirements.txt

RUN pip install --no-cache-dir --user -r /tmp/requirements.txt
RUN pip install --no-cache-dir -r /tmp/requirements.txt
6 changes: 3 additions & 3 deletions airflow/Dockerfile.composer
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM apache/airflow:2.4.3-python3.8
FROM apache/airflow:2.10.2-python3.11

# install gcloud as root, then switch back to airflow
USER root
Expand All @@ -15,8 +15,8 @@ RUN gcloud components install gke-gcloud-auth-plugin

USER airflow

COPY requirements-composer-2.6.5-airflow-2.5.3.txt /tmp/requirements-composer-2.6.5-airflow-2.5.3.txt
RUN pip install --no-cache-dir --user -r /tmp/requirements-composer-2.6.5-airflow-2.5.3.txt
COPY requirements-composer-2.11.1-airflow-2.10.2.txt /tmp/requirements-composer-2.11.1-airflow-2.10.2.txt
RUN pip install --no-cache-dir --user -r /tmp/requirements-composer-2.11.1-airflow-2.10.2.txt

COPY requirements.txt /tmp/requirements.txt
RUN pip install --no-cache-dir --user -r /tmp/requirements.txt
Expand Down
2 changes: 1 addition & 1 deletion airflow/dags/airtable_loader_v2/generate_gtfs_download_configs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
GTFSDownloadConfigExtract,
get_fs,
)
from pydantic import ValidationError
from pydantic.v1 import ValidationError


def gtfs_datasets_to_extract_configs(
Expand Down
2 changes: 1 addition & 1 deletion airflow/dags/download_gtfs_schedule_v2/download_schedule_feeds.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
get_fs,
get_latest,
)
from pydantic import validator
from pydantic.v1 import validator
from requests.exceptions import HTTPError

GTFS_FEED_LIST_ERROR_THRESHOLD = 0.95
Expand Down
2 changes: 1 addition & 1 deletion airflow/dags/sync_ntd_data_xlsx/scrape_ntd_xlsx_urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import requests
from bs4 import BeautifulSoup
from pydantic import HttpUrl, ValidationError, parse_obj_as
from pydantic.v1 import HttpUrl, ValidationError, parse_obj_as

from airflow.exceptions import AirflowException

Expand Down
2 changes: 1 addition & 1 deletion airflow/plugins/operators/airtable_to_gcs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from calitp_data_infra.auth import get_secret_by_name
from calitp_data_infra.storage import get_fs, make_name_bq_safe
from pyairtable import Api
from pydantic import BaseModel
from pydantic.v1 import BaseModel

from airflow.models import BaseOperator

Expand Down
2 changes: 1 addition & 1 deletion airflow/plugins/operators/blackcat_to_gcs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import pendulum
import requests
from calitp_data_infra.storage import get_fs, make_name_bq_safe
from pydantic import BaseModel
from pydantic.v1 import BaseModel

from airflow.models import BaseOperator

Expand Down
6 changes: 3 additions & 3 deletions airflow/plugins/operators/littlepay_raw_sync.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
get_fs,
get_latest_file,
)
from pydantic.class_validators import validator
from pydantic.error_wrappers import ValidationError
from pydantic.main import BaseModel
from pydantic.v1.class_validators import validator
from pydantic.v1.error_wrappers import ValidationError
from pydantic.v1.main import BaseModel
from tqdm import tqdm
from tqdm.contrib.logging import logging_redirect_tqdm

Expand Down
2 changes: 1 addition & 1 deletion airflow/plugins/operators/scrape_ntd_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
get_fs,
make_name_bq_safe,
)
from pydantic import HttpUrl, parse_obj_as
from pydantic.v1 import HttpUrl, parse_obj_as

from airflow.exceptions import AirflowException
from airflow.models import BaseOperator # type: ignore
Expand Down
2 changes: 1 addition & 1 deletion airflow/plugins/operators/scrape_ntd_xlsx.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
get_fs,
make_name_bq_safe,
)
from pydantic import HttpUrl, parse_obj_as
from pydantic.v1 import HttpUrl, parse_obj_as

from airflow.exceptions import AirflowException
from airflow.models import BaseOperator # type: ignore
Expand Down
2 changes: 1 addition & 1 deletion airflow/plugins/operators/scrape_state_geoportal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import pendulum
import requests
from calitp_data_infra.storage import PartitionedGCSArtifact, get_fs # type: ignore
from pydantic import HttpUrl, parse_obj_as
from pydantic.v1 import HttpUrl, parse_obj_as

from airflow.exceptions import AirflowException
from airflow.models import BaseOperator # type: ignore
Expand Down
2 changes: 1 addition & 1 deletion airflow/plugins/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
PartitionedGCSArtifact,
fetch_all_in_partition,
)
from pydantic import validator
from pydantic.v1 import validator

SCHEDULE_UNZIPPED_BUCKET = os.environ["CALITP_BUCKET__GTFS_SCHEDULE_UNZIPPED"]
SCHEDULE_UNZIPPED_BUCKET_HOURLY = os.environ[
Expand Down
Loading
Loading