Merge branch 'main' of github.com:sartography/spiff-arena

.github/workflows/tests.yml

@@ -287,7 +287,7 @@ jobs:
           ./bin/run_ci_session coverage
 
       - name: Upload coverage report
-        uses: codecov/codecov-action@v4.0.2
+        uses: codecov/codecov-action@v4.1.0
 
       - name: SonarCloud Scan
         uses: sonarsource/sonarcloud-github-action@v2.1.1

.gitignore

@@ -8,3 +8,4 @@ version_info.json
 UNKNOWN.egg-info/
 process_models/
 .ipynb_checkpoints
+.env*

Makefile

@@ -29,7 +29,7 @@ all: dev-env start-dev run-pyl
 build-images:
 	$(DOCKER_COMPOSE) build
 
-dev-env: build-images fe-npm-i be-recreate-db
+dev-env: stop-dev build-images fe-npm-i be-recreate-db
 	@/bin/true
 
 start-dev: stop-dev
@@ -69,7 +69,7 @@ fe-logs:
 	docker logs -f $(FRONTEND_CONTAINER)
 
 fe-npm-i:
-	$(IN_FRONTEND) npm i
+	$(IN_FRONTEND) npm i && git checkout -- spiffworkflow-frontend/package-lock.json
 
 fe-sh:
 	$(IN_FRONTEND) /bin/bash
@@ -88,7 +88,7 @@ take-ownership:
 
 .PHONY: build-images dev-env \
 	start-dev stop-dev \
-	be-clear-log-file be-logs be-recreate-db be-ruff be-sh be-tests be-tests-par \
+	be-clear-log-file be-logs be-mypy be-recreate-db be-ruff be-sh be-tests be-tests-par \
 	fe-lint-fix fe-logs fe-npm-i fe-sh \
 	pre-commit run-pyl \
 	take-ownership

README.md

@@ -73,7 +73,7 @@ If you have `docker` and `docker compose`, as an alternative to locally installi
 
 After the containers are set up, you can run `make start-dev` and `make stop-dev` to start and stop the servers. If the frontend or backend lock file changes, `make dev-env` will recreate the containers with the new dependencies.
 
-Please refer to the [Makefile](Makefile) as the source of truth, but for a summary of the available `make` targets.
+Please refer to the [Makefile](Makefile) as the source of truth, but for a summary of the available `make` targets:
 
 | Target | Action |
 |----|----|

docker-compose.yml

@@ -41,7 +41,7 @@ services:
     ports:
       - "${SPIFF_BACKEND_PORT:-8000}:${SPIFF_BACKEND_PORT:-8000}/tcp"
     volumes:
-      - ./process_models:/app/process_models
+      - ${SPIFFWORKFLOW_BACKEND_LOCAL_BPMN_SPEC_DIR:-./process_models}:/app/process_models
       - spiffworkflow_backend_db:/app/db_volume
     healthcheck:
       test: "curl localhost:${SPIFF_BACKEND_PORT:-8000}/v1.0/status --fail"

poetry.lock

@@ -556,13 +556,13 @@ files = [
 
 [[package]]
 name = "reorder-python-imports"
-version = "3.9.0"
+version = "3.12.0"
 description = "Tool for reordering python imports"
 optional = false
-python-versions = ">=3.7"
+python-versions = ">=3.8"
 files = [
-    {file = "reorder_python_imports-3.9.0-py2.py3-none-any.whl", hash = "sha256:3f9c16e8781f54c944756d0d1eb34a8c863554f7a4eb3693f574fe19b1a29b56"},
-    {file = "reorder_python_imports-3.9.0.tar.gz", hash = "sha256:49292ed537829a6bece9fb3746fc1bbe98f52643be5de01a4e13680268a5b0ec"},
+    {file = "reorder_python_imports-3.12.0-py2.py3-none-any.whl", hash = "sha256:930c23a42192b365e20e191a4d304d93e645bd44c242d8bc64accc4a3b2b0f3d"},
+    {file = "reorder_python_imports-3.12.0.tar.gz", hash = "sha256:f93106a662b0c034ca81c91fd1c2f21a1e94ece47c9f192672e2a13c8ec1856c"},
 ]
 
 [package.dependencies]
@@ -719,4 +719,4 @@ test = ["covdefaults (>=2.2.2)", "coverage (>=7.1)", "coverage-enable-subprocess
 [metadata]
 lock-version = "2.0"
 python-versions = ">=3.11,<3.13"
-content-hash = "46d1593c25923da2e641b94acbf53947b90f22d9425c4c7137f1c7cdd12659d4"
+content-hash = "1e7e942504aa9a418f93fb9a79adef2d13df35b78c180936e1a96fadaa8bd3b0"

pyproject.toml

@@ -27,7 +27,7 @@ bandit = "1.7.2"
 flake8-bugbear = "^22.10.25"
 flake8-docstrings = "^1.6.0"
 flake8-rst-docstrings = "^0.2.7"
-reorder-python-imports = "^3.9.0"
+reorder-python-imports = "^3.12.0"
 pre-commit-hooks = "^4.5.0"
 pyupgrade = "^3.1.0"
 

spiffworkflow-backend/Dockerfile

@@ -27,7 +27,7 @@ RUN apt-get update \
 
 # keep pip up to date
 RUN pip install --upgrade pip
-RUN pip install poetry==1.6.1
+RUN pip install poetry==1.8.1
 
 
 ######################## - SETUP

spiffworkflow-backend/dev.Dockerfile

@@ -8,7 +8,7 @@ RUN apt-get update \
     pkg-config libffi-dev git-core curl
 
 RUN pip install --upgrade pip
-RUN pip install poetry==1.6.1 pytest-xdist
+RUN pip install poetry==1.8.1 pytest-xdist==3.5.0
 
 COPY pyproject.toml poetry.lock .
 RUN poetry install --no-root

spiffworkflow-frontend/dev.Dockerfile

@@ -2,8 +2,4 @@ FROM node:20.8.1-bookworm-slim AS base
 
 WORKDIR /app
 
-COPY package.json package-lock.json .
-
-RUN npm i
-
 CMD ["npm", "run", "docker:start"]