From badb8216cf73162f96e946c196c89ae6e7a68a2f Mon Sep 17 00:00:00 2001 From: Luca Colagrande Date: Sat, 10 Aug 2024 06:55:03 +0200 Subject: [PATCH] container: Remove local Python package installation --- .github/workflows/ci.yml | 4 ++++ .github/workflows/lint.yml | 2 ++ util/container/Dockerfile | 8 ++++---- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 379c03eb5..c17dd9aed 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,6 +48,8 @@ jobs: - uses: actions/checkout@v2 with: submodules: 'recursive' + - name: Install local Python packages + run: pip install . - name: Build Software working-directory: target/snitch_cluster run: | @@ -81,6 +83,8 @@ jobs: - uses: actions/checkout@v2 with: submodules: 'recursive' + - name: Install local Python packages + run: pip install . - name: Build Software run: | bender vendor init diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index cbe6372b7..71495dc2e 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -48,6 +48,8 @@ jobs: - uses: actions/checkout@v4 with: submodules: true + - name: Install local Python packages + run: pip install . - name: Generate opcodes run: | ./util/generate-opcodes.sh diff --git a/util/container/Dockerfile b/util/container/Dockerfile index 0bbd03730..f6e98f713 100644 --- a/util/container/Dockerfile +++ b/util/container/Dockerfile @@ -155,10 +155,10 @@ ENV VIRTUAL_ENV "/root/.venvs/snitch_cluster" RUN /opt/python/bin/python3 -m venv ${VIRTUAL_ENV} ENV PATH="${VIRTUAL_ENV}/bin:${PATH}" # Install Python requirements -COPY . /tmp/snitch_cluster -RUN pip install -r /tmp/snitch_cluster/python-requirements.txt -RUN pip install /tmp/snitch_cluster/ -RUN rm -rf /tmp/snitch_cluster +COPY python-requirements.txt /tmp/python-requirements.txt +COPY docs/requirements.txt /tmp/docs/requirements.txt +COPY sw/dnn/requirements.txt /tmp/sw/dnn/requirements.txt +RUN pip install -r /tmp/python-requirements.txt # Add Verilator to PATH ENV PATH "/tools/verilator/bin:${PATH}"