deps: bump cinnabar (bug 2013801)

Dockerfile

@@ -22,15 +22,8 @@ COPY install_git-cinnabar.sh .
 RUN ./install_git-cinnabar.sh \
     && mv git-cinnabar git-remote-hg /usr/bin/
 
-# install test dependencies
-RUN pip install -U pip pytest pytest-mock pip-tools
-
-# setup just the venv so changes to the source won't require a full venv
-# rebuild
-COPY --chown=app:app README.md .
-COPY --chown=app:app pyproject.toml .
-RUN pip-compile --verbose pyproject.toml \
-    && pip install -r requirements.txt
+COPY --chown=app:app requirements.txt .
+RUN pip install -r requirements.txt
 
 RUN mkdir -p /clones \
   && chown app:app /clones
@@ -39,6 +32,7 @@ RUN mkdir -p /clones \
 COPY docker/hgrc /etc/mercurial/hgrc
 COPY docker/entrypoint.sh /entrypoint.sh
 COPY --chown=app:app . /app
+
 # Make the install editable so we can mount the local source into a container based on this image.
 RUN pip install -e /app
 USER app

README.md

@@ -172,6 +172,12 @@ $ docker compose run --rm test
 $ docker compose down
 ```
 
+## Update requirements
+
+```console
+$ docker compose run --rm pip-compile
+```
+
 ## Known limitations
 
 - Merge commits cannot be pushed to mercurial repositories;

docker-compose.yaml

@@ -56,6 +56,15 @@ services:
     networks:
       - pulse_network
 
+  pip-compile:
+    <<: *sync_config
+    command: ["--verbose", "--all-build-deps", "--allow-unsafe", "--extra=dev", "--generate-hashes", "--output-file=requirements.txt", "pyproject.toml"]
+    entrypoint: pip-compile
+    volumes:
+      - .:/app
+    profiles:
+      - pip-compile
+
   pulse:
     image: rabbitmq:3-management-alpine
     volumes:

install_git-cinnabar.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-VER=3f0a8a4c35b5be88ddc229c0dd099b99c67483ce
+VER=71ac248b7dd7b56ac2cfe764c914a6a3025ea5af
 
 curl https://raw.githubusercontent.com/glandium/git-cinnabar/${VER}/download.py -o download.py
 chmod u+x download.py

pyproject.toml

@@ -15,13 +15,23 @@ dependencies = [
     "mozillapulse",
     "mozlog",
     "pydantic",
-    "pytest>=8.3.4",
-    "pytest-ruff",
-    "pytest-cov",
     "sentry_sdk",
     "devtools",
 ]
 
+[project.optional-dependencies]
+dev = [
+    # Pin due to https://github.com/jazzband/pip-tools/issues/2319, 
+    # otherwise pip-compile doesn't work in the container.
+    "pip<26.0",
+
+    "pip-tools",
+    "pytest>=8.3.4",
+    "pytest-cov",
+    "pytest-mock",
+    "pytest-ruff",
+]
+
 [project.scripts]
 git-hg-sync = "git_hg_sync.__main__:main"
 git-hg-cli = "git_hg_sync.cli:main"