Merge branch 'master' into 'master'

deps: Update container image / python

See merge request banjo.decomp/banjo-kazooie!134

.gitignore

@@ -74,3 +74,5 @@ undefined_funcs_auto*
 #secret folder
 tmp/
 tmp/*
+
+.venv

.gitlab-ci.yml

@@ -63,6 +63,10 @@ build-test-us10:
     - echo "Expected SHA1   - $BASEROM_US10_SHA1"
     - if [ "${FILE_SHA1}" != "${BASEROM_US10_SHA1}" ]; then echo "Checksum verification failed"; exit 1; else echo "Checksum verification passed"; fi
   script:
+    # Create venv
+    - python3 -m venv .venv
+    # Install deps
+    - .venv/bin/python3 -m pip install -r requirements.txt
     # Compile the code
     - make
     # Check if the resulting ROM is the same as the expected one
@@ -85,6 +89,10 @@ build-test-pal:
     - echo "Expected SHA1   - $BASEROM_PAL_SHA1"
     - if [ "${FILE_SHA1}" != "${BASEROM_PAL_SHA1}" ]; then echo "Checksum verification failed"; exit 1; else echo "Checksum verification passed"; fi
   script:
+    # Create venv
+    - python3 -m venv .venv
+    # Install deps
+    - .venv/bin/python3 -m pip install -r requirements.txt
     # Compile the code
     - make VERSION=pal
     # Check if the resulting decompressed ROM is the same as the expected one

Dockerfile

@@ -1,6 +1,8 @@
-FROM ubuntu:20.04 AS build
+FROM ubuntu:25.04 AS build
 ENV DEBIAN_FRONTEND=noninteractive
 
+WORKDIR /banjo
+
 # (for debug purposes)
 RUN echo "System arch: $(uname -a)\nDPKG arch: $(dpkg --print-architecture)"
 
@@ -13,10 +15,4 @@ RUN apt-get update && apt-get install -y $(cat packages.txt) && rm packages.txt
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sed 's#/proc/self/exe#\/bin\/sh#g' | CARGO_HOME=/opt/cargo sh -s -- -y
 ENV PATH=/opt/cargo/bin:$PATH
 
-# Install Python dependencies
-COPY requirements.txt ./
-COPY tools/n64splat/requirements.txt ./tools/n64splat/requirements.txt
-RUN python3 -m pip install -r requirements.txt
-
-WORKDIR /banjo
 ENTRYPOINT ["/bin/bash", "-c"]

Makefile

@@ -37,7 +37,7 @@ AS      := $(CROSS)as
 LD      := $(CROSS)ld -b elf32-tradbigmips
 OBJDUMP := $(CROSS)objdump
 OBJCOPY := $(CROSS)objcopy
-PYTHON  := python3
+PYTHON  := .venv/bin/python3
 GREP    := grep -rl
 SPLAT   := $(PYTHON) tools/n64splat/split.py
 PRINT   := printf

README.md

@@ -32,7 +32,8 @@ Works with Ubuntu 18.04 or higher.
 sudo apt-get update && sudo apt-get install -y $(cat packages.txt)
 curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
 git submodule update --init --recursive
-python3 -m pip install -r requirements.txt
+python3 -m venv .venv
+.venv/bin/python3 -m pip install -r requirements.txt
 ```
 
 ### 2. Add baserom

packages.txt

@@ -7,6 +7,7 @@ curl
 libglib2.0-0
 libssl-dev
 python3
+python3-venv
 python3-pip
 unzip
 wget

requirements.txt

@@ -11,4 +11,4 @@ python-Levenshtein
 python-ranges
 pyyaml
 watchdog
-spimdisasm==1.35.0
+spimdisasm==1.35.0