Merge branch 'release/25.1.0'

Author: cslzchen

.github/workflows/test-build.yml

@@ -5,59 +5,71 @@ on: [push, pull_request, workflow_dispatch]
 jobs:
 
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     env:
-      GHA_DISTRO: ubuntu-20.04
+      GHA_DISTRO: ubuntu-24.04
     if: "!contains(github.event.head_commit.message, 'skip ci')"
     strategy:
       matrix:
-        python-version: [3.6]
+        python-version: [3.13]
     steps:
       - name: Git checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
+
       - name: Cache Build Requirements
         id: pip-cache-step
         uses: actions/cache@v4
         with:
-          path: ${{ env.pythonLocation }}
-          key: ${{ env.GHA_DISTRO }}-${{ env.pythonLocation }}-${{ hashFiles('requirements.txt', 'dev-requirements.txt') }}
-      - name: install dependencies
-        if: steps.pip-cache-step.outputs.cache-hit != 'true'
+          path: ~/.cache/pip
+          key: ${{ env.GHA_DISTRO }}-${{ matrix.python-version }}-${{ hashFiles('pyproject.toml', 'poetry.lock') }}
+
+      - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip==18.1
-          pip install -r dev-requirements.txt
+          python3 -m pip install poetry==2.1.2
+          poetry install --no-root --without=docs --with=dev
 
   runtests:
     name: Run unit tests
     needs: build
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     env:
-      GHA_DISTRO: ubuntu-20.04
+      GHA_DISTRO: ubuntu-24.04
+    strategy:
+      matrix:
+        python-version: [3.13]
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up Python 3.6
-        uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
         with:
-          python-version: 3.6
+          python-version: ${{ matrix.python-version }}
+
       - name: Cache pip
         uses: actions/cache@v4
         with:
-          path: ${{ env.pythonLocation }}
-          key: ${{ env.GHA_DISTRO }}-${{ env.pythonLocation }}-${{ hashFiles('requirements.txt', 'dev-requirements.txt') }}
-      - name: run syntax checks
-        run: |
-          flake8 .
-      - name: build plugins
+          path: ~/.cache/pip
+          key: ${{ env.GHA_DISTRO }}-${{ matrix.python-version }}-${{ hashFiles('pyproject.toml', 'poetry.lock') }}
+
+      - name: Install test dependencies
         run: |
-          python setup.py develop
-      - name: run unit tests
+          python3 -m pip install poetry==2.1.2
+          python3 -m pip install setuptools==80.1.0
+          poetry install --without=docs --with=dev
+
+      - name: Run flake8
+        run: poetry run flake8 .
+
+      - name: Run unit tests
         run: |
-          py.test --cov-report term-missing --cov waterbutler tests
-      - name: Upload coverage data to coveralls.io
-        run: coveralls --service=github
+          poetry run pytest --cov-report term-missing --cov waterbutler tests
+
+      - name: Upload coverage to Coveralls
+        run: poetry run coveralls --service=github
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG

@@ -2,6 +2,11 @@
 ChangeLog
 *********
 
+25.1.0 (2025-08-08)
+===================
+
+- WB Upgrade
+
 25.0.0 (2025-02-21)
 ===================
 

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.6-slim-buster
+FROM python:3.13-slim
 
 RUN usermod -d /home www-data && chown www-data:www-data /home
 
@@ -14,9 +14,10 @@ RUN apt-get update \
         build-essential \
         libssl-dev \
         libffi-dev \
-        python-dev \
         gnupg2 \
         # grab gosu for easy step-down from root
+        cargo \
+        rustc \
         gosu \
     && apt-get clean \
     && apt-get autoremove -y \
@@ -25,21 +26,22 @@ RUN apt-get update \
 RUN mkdir -p /code
 WORKDIR /code
 
-RUN pip install -U pip==18.1
-RUN pip install setuptools==37.0.0
-
-COPY ./requirements.txt /code/
-
-RUN pip install --no-cache-dir -r /code/requirements.txt
+COPY pyproject.toml poetry.lock* /code/
+RUN pip install poetry==2.1.2
+RUN pip install setuptools==80.1.0
+RUN poetry install --no-root --without=docs
 
 # Copy the rest of the code over
 COPY ./ /code/
 
 ARG GIT_COMMIT=
-ENV GIT_COMMIT ${GIT_COMMIT}
+ENV GIT_COMMIT=${GIT_COMMIT}
+ENV POETRY_NO_INTERACTION=1
+ENV POETRY_VIRTUALENVS_CREATE=0
+ENV POETRY_VIRTUALENVS_IN_PROJECT=1
 
-RUN python setup.py develop
+RUN poetry install --without docs
 
 EXPOSE 7777
 
-CMD ["gosu", "www-data", "invoke", "server"]
+CMD ["gosu", "www-data", "python3", "-m", "invoke", "server"]