Skip to content

Commit

Permalink
drop dagster-airflow docker pin (#25475)
Browse files Browse the repository at this point in the history
the urrlib2 pin dropped in
#25451 was related to this

## How I Tested These Changes

bk
  • Loading branch information
alangenfeld authored and clairelin135 committed Oct 24, 2024
1 parent c027996 commit 4dd15bc
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 41 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,46 +12,47 @@ FROM "${BASE_IMAGE}" AS snapshot_builder

RUN apt-get update -yqq \
&& apt-get install -yqq \
build-essential \
cron \
g++ \
gcc \
git \
make

build-essential \
cron \
g++ \
gcc \
git \
make

RUN pip install -U uv
RUN git clone --depth 1 https://github.com/dagster-io/dagster.git \
&& cd dagster \
&& pip install \
-e python_modules/dagster \
-e python_modules/dagster-pipes \
-e python_modules/dagster-graphql \
-e python_modules/dagster-webserver \
-e python_modules/libraries/dagster-celery[flower,redis,kubernetes] \
-e python_modules/libraries/dagster-postgres \
-e python_modules/libraries/dagster-pandas \
-e python_modules/libraries/dagster-aws \
-e python_modules/libraries/dagster-gcp \
-e python_modules/libraries/dagster-k8s \
-e python_modules/libraries/dagster-celery-k8s \
&& python -m uv pip install \
-e python_modules/dagster \
-e python_modules/dagster-pipes \
-e python_modules/dagster-graphql \
-e python_modules/dagster-webserver \
-e python_modules/libraries/dagster-celery[flower,redis,kubernetes] \
-e python_modules/libraries/dagster-postgres \
-e python_modules/libraries/dagster-pandas \
-e python_modules/libraries/dagster-aws \
-e python_modules/libraries/dagster-gcp \
-e python_modules/libraries/dagster-k8s \
-e python_modules/libraries/dagster-docker \
-e python_modules/libraries/dagster-celery-k8s \
&& pip freeze --exclude-editable > /snapshot-reqs.txt


FROM "${BASE_IMAGE}"

COPY --from=snapshot_builder /snapshot-reqs.txt .

# gcc etc needed for building gevent
RUN apt-get update -yqq \
&& apt-get install -yqq \
build-essential \
cron \
g++ \
gcc \
git \
make

RUN pip install -r /snapshot-reqs.txt \
&& rm /snapshot-reqs.txt
build-essential \
cron \
g++ \
gcc \
git \
make

RUN pip install -U uv
RUN python -m uv pip install -r /snapshot-reqs.txt

# New versions of debian require allowlisting folders where `git` can run
RUN git config --system --add safe.directory \*
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"3.10": 2024-02-14T041706
"3.11": 2024-02-14T041706
"3.12": 2024-02-14T041706
"3.8": 2024-02-14T041706
"3.9": 2024-02-14T041706
"3.10": 2024-10-23T230432
"3.11": 2024-10-23T230432
"3.12": 2024-10-23T230432
"3.8": 2024-10-23T230432
"3.9": 2024-10-23T230432
8 changes: 3 additions & 5 deletions python_modules/dagster-test/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,10 @@ ENV DAGSTER_DISABLE_TELEMETRY=true
ENV PYTHONUNBUFFERED=1

RUN pip install -U uv
# dagster-celery specified twice to deal with pip resolution in pip 20.3.3 when only
# extras are specified

RUN python -m uv pip install \
-e modules/dagster \
-e modules/dagster-graphql \
-e modules/dagster-celery \
-e modules/dagster-celery[flower,redis,kubernetes] \
-e modules/dagster-webserver \
-e modules/dagster-postgres \
Expand All @@ -32,8 +30,8 @@ RUN python -m uv pip install \
-e modules/dagster-airflow \
-e modules/dagstermill \
-e modules/dagster-pipes \
-e . \
pyparsing\<3.0.0
-e .


RUN ! (pip list --exclude-editable | grep -e dagster)

Expand Down
1 change: 0 additions & 1 deletion python_modules/libraries/dagster-airflow/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ def get_version() -> str:
python_requires=">=3.8,<3.13",
install_requires=[
f"dagster{pin}",
"docker>=5.0.3,<6.0.0",
"lazy_object_proxy",
"setuptools<71.0.0",
"pendulum",
Expand Down
6 changes: 5 additions & 1 deletion python_modules/libraries/dagster-docker/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ def get_version() -> str:
packages=find_packages(exclude=["dagster_docker_tests*"]),
include_package_data=True,
python_requires=">=3.8,<3.13",
install_requires=[f"dagster{pin}", "docker", "docker-image-py"],
install_requires=[
f"dagster{pin}",
"docker",
"docker-image-py",
],
zip_safe=False,
)

0 comments on commit 4dd15bc

Please sign in to comment.