Merge pull request #5 from technophylax/fix-ghcr-badges

technophylax · web-flow · commit 251a421c2cb3 · 2025-12-20T20:41:16.000-06:00
chore: align python 3.12, split dev deps, docs cleanup
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -27,8 +27,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          python -m pip install -r requirements.txt
-          python -m pip install ruff cyclonedx-bom
+          python -m pip install -r requirements.txt -r requirements-dev.txt
       - name: Lint
         run: ruff check .
       - name: Tests
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -10,6 +10,7 @@ Thanks for your interest in OCPA! This project welcomes issues, PRs, and securit
   python -m venv .venv
   source .venv/bin/activate
   pip install -r requirements.txt
+  pip install -r requirements-dev.txt
   ```
 
 ## Tests and lint
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.11-slim
+FROM python:3.12-slim
 
 ENV PYTHONDONTWRITEBYTECODE=1 \
     PYTHONUNBUFFERED=1 \
diff --git a/Makefile b/Makefile
@@ -2,14 +2,17 @@ PYTHON ?= python3.12
 VENV ?= .venv
 ACTIVATE = source $(VENV)/bin/activate
 
-.PHONY: venv deps demo demo-calls lint test scenarios
+.PHONY: venv deps deps-dev demo demo-calls lint test scenarios
 
 venv:
 	$(PYTHON) -m venv $(VENV)
 
 deps: venv
 	$(ACTIVATE) && pip install -r requirements.txt
 
+deps-dev: deps
+	$(ACTIVATE) && pip install -r requirements-dev.txt
+
 demo:
 	$(ACTIVATE) && bash scripts/demo.sh
 
diff --git a/pyproject.toml b/pyproject.toml
@@ -24,7 +24,7 @@ dependencies = [
 ]
 
 [project.optional-dependencies]
-dev = ["pytest>=7.4.0", "pytest-cov>=4.1.0", "ruff>=0.6.0", "pip-audit>=2.7.3"]
+dev = ["pytest>=7.4.0", "pytest-cov>=4.1.0", "ruff>=0.6.0", "pip-audit>=2.7.3", "cyclonedx-bom>=7.2.0"]
 
 [tool.ruff]
 line-length = 140
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -0,0 +1,5 @@
+pytest>=7.4.0
+pytest-cov>=4.1.0
+ruff>=0.6.0
+pip-audit>=2.7.3
+cyclonedx-bom>=7.2.0
diff --git a/requirements.txt b/requirements.txt
@@ -3,8 +3,6 @@ PyYAML>=6.0.0
 opentelemetry-api>=1.22.0
 opentelemetry-sdk>=1.22.0
 opentelemetry-exporter-otlp>=1.22.0
-pytest>=7.4.0
-pytest-cov>=4.1.0
 fastapi>=0.110.0
 uvicorn[standard]>=0.23.0
 prometheus-client>=0.20.0

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM python:3.11-slim`
	`1`	`+FROM python:3.12-slim`
`2`	`2`
`3`	`3`	`ENV PYTHONDONTWRITEBYTECODE=1 \`
`4`	`4`	`PYTHONUNBUFFERED=1 \`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ dependencies = [`
`24`	`24`	`]`
`25`	`25`
`26`	`26`	`[project.optional-dependencies]`
`27`		`-dev = ["pytest>=7.4.0", "pytest-cov>=4.1.0", "ruff>=0.6.0", "pip-audit>=2.7.3"]`
	`27`	`+dev = ["pytest>=7.4.0", "pytest-cov>=4.1.0", "ruff>=0.6.0", "pip-audit>=2.7.3", "cyclonedx-bom>=7.2.0"]`
`28`	`28`
`29`	`29`	`[tool.ruff]`
`30`	`30`	`line-length = 140`