@@ -46,12 +46,8 @@ RUN pip install -qq --upgrade pip && \
4646FROM base AS ci
4747
4848# TODO(markblee): Remove gcp,vertexai_tensorboard from CI.
49- <<<<<<< HEAD
5049RUN uv pip install -qq .[core,audio,orbax,dev,gcp,vertexai_tensorboard] && \
5150 uv cache clean
52- =======
53- RUN uv pip install .[core,audio,orbax,dev,gcp,vertexai_tensorboard,open_api] && uv cache clean
54- >>>>>>> 4109ab0 (Move UV_FIND_LINKS to pyproject.toml)
5551COPY . .
5652
5753# Defaults to an empty string, i.e. run pytest against all files.
@@ -70,11 +66,7 @@ FROM base AS bastion
7066# TODO(markblee): Consider copying large directories separately, to cache more aggressively.
7167# TODO(markblee): Is there a way to skip the "production" deps?
7268COPY . /root/
73- <<<<<<< HEAD
7469RUN uv pip install -qq .[core,gcp,vertexai_tensorboard] && uv cache clean
75- =======
76- RUN uv pip install .[core,gcp,vertexai_tensorboard] && uv cache clean
77- >>>>>>> 4109ab0 (Move UV_FIND_LINKS to pyproject.toml)
7870
7971# ###############################################################################
8072# Dataflow container spec. #
@@ -85,11 +77,7 @@ FROM base AS dataflow
8577# Beam workers default to creating a new virtual environment on startup. Instead, we want them to
8678# pickup the venv setup above. An alternative is to install into the global environment.
8779ENV RUN_PYTHON_SDK_IN_DEFAULT_ENVIRONMENT=1
88- <<<<<<< HEAD
8980RUN uv pip install -qq .[core,gcp,dataflow] && uv cache clean
90- =======
91- RUN uv pip install .[core,gcp,dataflow] && uv cache clean
92- >>>>>>> 4109ab0 (Move UV_FIND_LINKS to pyproject.toml)
9381COPY . .
9482
9583# Dataflow workers can't start properly if the entrypoint is not set
0 commit comments