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

uv 0.5.21 no longer requires explicit CC #273

Merged
merged 1 commit into from
Jan 21, 2025
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 .github/workflows/docs_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
uses: astral-sh/setup-uv@v4
with:
enable-cache: true
version: "0.5.7"
version: "0.5.21"
- name: Install Pandoc
run: sudo apt-get install pandoc
- name: Install model
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
uses: astral-sh/setup-uv@v4
with:
enable-cache: true
version: "0.5.7"
version: "0.5.21"
- name: Install Pandoc
run: sudo apt-get install pandoc
- name: Install model
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
uses: astral-sh/setup-uv@v4
with:
enable-cache: true
version: "0.5.7"
version: "0.5.21"
- name: Install model
run: USE_CYTHON=1 uv sync --frozen
- name: Test ParCa reproducibility
Expand Down Expand Up @@ -46,7 +46,7 @@ jobs:
uses: astral-sh/setup-uv@v4
with:
enable-cache: true
version: "0.5.7"
version: "0.5.21"
- name: Install model
run: USE_CYTHON=1 uv sync --frozen
- name: Install nextflow edge
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
uses: astral-sh/setup-uv@v4
with:
enable-cache: true
version: "0.5.7"
version: "0.5.21"
- name: Install model
run: USE_CYTHON=1 uv sync --frozen --extra dev
- name: Test with pytest
Expand All @@ -44,7 +44,7 @@ jobs:
uses: astral-sh/setup-uv@v4
with:
enable-cache: true
version: "0.5.7"
version: "0.5.21"
- name: Install model
run: USE_CYTHON=1 uv sync --frozen --extra dev
- name: Mypy
Expand All @@ -58,7 +58,7 @@ jobs:
uses: astral-sh/setup-uv@v4
with:
enable-cache: true
version: "0.5.7"
version: "0.5.21"
- name: Install model
run: USE_CYTHON=1 uv sync --frozen --extra dev
- name: Ruff
Expand Down
4 changes: 0 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,6 @@ Navigate into the cloned repository and use `uv` to install the model:
cd vEcoli
uv sync --frozen

> **Note:** If your C compiler is not `clang`, run `CC={your compiler} uv sync --frozen`
> instead to work around [this limitation](https://github.com/astral-sh/uv/issues/8429).
> For example, `CC=gcc uv sync --frozen` for `gcc`.

Finally, install `nextflow` [following these instructions](https://www.nextflow.io/docs/latest/install.html).
If you choose to install Java with SDKMAN!, after the Java installation
finishes, close and reopen your terminal before continuing with the
Expand Down
4 changes: 2 additions & 2 deletions runscripts/container/runtime/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# Add option `--build-arg from=ABC` to build from a different base image "ABC"
# but DO NOT USE an alpine base since the simulation math comes out different!
# See https://pythonspeed.com/articles/alpine-docker-python/ for more reasons.
ARG from=ghcr.io/astral-sh/uv:0.5.7-python3.12-bookworm-slim@sha256:444d948934bdb22e3204317842be6e1ad454cfa85103287a2ed18e471ede1f5b
ARG from=ghcr.io/astral-sh/uv:0.5.21-python3.12-bookworm-slim@sha256:d7758d4b7176a067f7ae48239b44a8ebe9c16b00d1ec53867d41317a72e59717
FROM ${from}

RUN echo "alias ls='ls --color=auto'" >> ~/.bashrc \
Expand All @@ -33,7 +33,7 @@ ENV UV_COMPILE_BYTECODE=1

COPY uv.lock pyproject.toml /vEcoli/
# Install the project's dependencies using the lockfile and settings
RUN CC=gcc uv sync --frozen --no-install-project --no-dev
RUN uv sync --frozen --no-install-project --no-dev

# Place executables in the environment at the front of the path
ENV PATH="/vEcoli/.venv/bin:$PATH"
Expand Down
5 changes: 2 additions & 3 deletions runscripts/container/runtime/Singularity
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
Bootstrap: docker
From: ghcr.io/astral-sh/uv@sha256:444d948934bdb22e3204317842be6e1ad454cfa85103287a2ed18e471ede1f5b
From: ghcr.io/astral-sh/uv@sha256:d7758d4b7176a067f7ae48239b44a8ebe9c16b00d1ec53867d41317a72e59717

%environment
export OPENBLAS_NUM_THREADS=1
export PATH="/vEcoli/.venv/bin:$PATH"
export UV_PROJECT_ENVIRONMENT="/vEcoli/.venv"
export CC=gcc

%labels
application "Whole Cell Model Runtime Environment"
Expand All @@ -27,7 +26,7 @@ From: ghcr.io/astral-sh/uv@sha256:444d948934bdb22e3204317842be6e1ad454cfa8510328

apt-get update && apt-get install -y git gcc procps

UV_COMPILE_BYTECODE=1 CC=gcc uv sync --frozen --no-install-project --no-dev --project vEcoli
UV_COMPILE_BYTECODE=1 uv sync --frozen --no-install-project --no-dev --project vEcoli

%runscript
# This defines the default behavior when the container is executed.
Expand Down
2 changes: 1 addition & 1 deletion runscripts/container/wholecell/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ LABEL application="Whole Cell Model of Escherichia coli" \
COPY . /vEcoli
WORKDIR /vEcoli

RUN CC=gcc uv sync --frozen
RUN uv sync --frozen

# Since this build runs as root, set permissions so running the container as
# another user will work: Parca writes into /vEcoli/cache/.
Expand Down
Loading