Skip to content

Commit fec5b12

Browse files
d0cdclaude
andcommitted
Fix pids_limit compose conflict, switch test-python to uv
Move pids_limit into deploy.resources.limits.pids to avoid conflict with the top-level pids_limit key (Docker Compose rejects both being set). Switch CI test-python from pip+venv to uv run for consistency with the rest of the toolchain. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent 5a1039c commit fec5b12

3 files changed

Lines changed: 4 additions & 8 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,8 @@ jobs:
4444
steps:
4545
- uses: actions/checkout@v4
4646
- uses: astral-sh/setup-uv@v4
47-
- name: Install dependencies
48-
run: |
49-
python3 -m venv /tmp/devbox-test-venv
50-
/tmp/devbox-test-venv/bin/pip install -r tests/pytest/requirements.txt
5147
- name: Run pytest
52-
run: /tmp/devbox-test-venv/bin/pytest tests/pytest/ -v
48+
run: uv run --with pytest --with pyyaml --with mitmproxy pytest tests/pytest/ -v
5349

5450
build-images:
5551
name: Build container images

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ test-shell:
99
bats tests/bats/
1010

1111
test-python:
12-
python3 -m pytest tests/pytest/ -v
12+
uv run --with pytest --with pyyaml --with mitmproxy pytest tests/pytest/ -v
1313

1414
ci: lint test

docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ services:
5353
limits:
5454
memory: ${DEVBOX_MEMORY:-8G}
5555
cpus: ${DEVBOX_CPUS:-4.0}
56-
pids_limit: 512
56+
pids: 512
5757
stdin_open: true
5858
tty: true
5959
restart: unless-stopped
@@ -67,7 +67,6 @@ services:
6767
- ALL
6868
security_opt:
6969
- no-new-privileges:true
70-
pids_limit: 128
7170
tmpfs:
7271
- /tmp:size=64M
7372
volumes:
@@ -82,6 +81,7 @@ services:
8281
limits:
8382
memory: 1G
8483
cpus: '1.0'
84+
pids: 128
8585
healthcheck:
8686
# Verify proxy is accepting connections. Addon loading is validated at startup.
8787
test: ["CMD", "python3", "-c", "import socket; s=socket.create_connection(('localhost', 8080), timeout=2); s.close()"]

0 commit comments

Comments
 (0)