WIP

.github/workflows/ci.yaml

@@ -19,8 +19,8 @@ env:
       - "dependabot/**"
       - "gh-readonly-queue/**"
       - "renovate/**"
-      - "tickets/**"
-      - "u/**"
+      # - "tickets/**"
+      # - "u/**"
     tags:
       - "*"
 
@@ -67,7 +67,7 @@ jobs:
     if: >
       github.event_name != 'merge_group'
       && (startsWith(github.ref, 'refs/tags/')
-          || startsWith(github.head_ref, 'tickets/'))
+          || startsWith(github.head_ref, 'u/tobyj/'))
 
     steps:
       - uses: actions/checkout@v4

.pre-commit-config.yaml

@@ -7,7 +7,7 @@ repos:
       - id: trailing-whitespace
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.8.0
+    rev: v0.8.1
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]

.python-version

@@ -0,0 +1 @@
+3.12

Makefile

@@ -6,15 +6,17 @@ help:
 	@echo "make update - Update pinned dependencies and run make init"
 	@echo "make update-deps - Update pinned dependencies"
 
+.venv:
+	uv venv
+
 .PHONY: init
 init:
-	pip install --upgrade uv
 	uv pip install -r requirements/main.txt -r requirements/dev.txt \
 	    -r requirements/tox.txt
 	uv pip install --editable .
 	rm -rf .tox
 	uv pip install --upgrade pre-commit
-	pre-commit install
+	uv run pre-commit install
 
 .PHONY: run
 run:
@@ -24,10 +26,9 @@ run:
 update: update-deps init
 
 .PHONY: update-deps
-update-deps:
-	pip install --upgrade uv
+update-deps: .venv
 	uv pip install --upgrade pre-commit
-	pre-commit autoupdate
+	uv run pre-commit autoupdate
 	uv pip compile --upgrade --universal --generate-hashes		\
 	    --output-file requirements/main.txt requirements/main.in
 	uv pip compile --upgrade --universal --generate-hashes		\

requirements/dev.in

@@ -14,10 +14,12 @@ asgi-lifespan
 coverage[toml]
 httpx
 mypy
+pre-commit
 pydantic
 pytest
 pytest-asyncio
 pytest-cov
+ruff
 
 # Documentation
 scriv

requirements/tox.txt

@@ -0,0 +1,92 @@
+# This file was autogenerated by uv via the following command:
+#    uv pip compile --universal --generate-hashes --output-file requirements/tox.txt requirements/tox.in
+cachetools==5.5.0 \
+    --hash=sha256:02134e8439cdc2ffb62023ce1debca2944c3f289d66bb17ead3ab3dede74b292 \
+    --hash=sha256:2cc24fb4cbe39633fb7badd9db9ca6295d766d9c2995f245725a46715d050f2a
+    # via tox
+chardet==5.2.0 \
+    --hash=sha256:1b3b6ff479a8c414bc3fa2c0852995695c4a026dcd6d0633b2dd092ca39c1cf7 \
+    --hash=sha256:e1cf59446890a00105fe7b7912492ea04b6e6f06d4b742b2c788469e34c82970
+    # via tox
+colorama==0.4.6 \
+    --hash=sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44 \
+    --hash=sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6
+    # via
+    #   -c requirements/dev.txt
+    #   -c requirements/main.txt
+    #   tox
+distlib==0.3.9 \
+    --hash=sha256:47f8c22fd27c27e25a65601af709b38e4f0a45ea4fc2e710f65755fa8caaaf87 \
+    --hash=sha256:a60f20dea646b8a33f3e7772f74dc0b2d0772d2837ee1342a00645c81edf9403
+    # via
+    #   -c requirements/dev.txt
+    #   virtualenv
+filelock==3.16.1 \
+    --hash=sha256:2082e5703d51fbf98ea75855d9d5527e33d8ff23099bec374a134febee6946b0 \
+    --hash=sha256:c249fbfcd5db47e5e2d6d62198e565475ee65e4831e2561c8e313fa7eb961435
+    # via
+    #   -c requirements/dev.txt
+    #   tox
+    #   virtualenv
+packaging==24.2 \
+    --hash=sha256:09abb1bccd265c01f4a3aa3f7a7db064b36514d2cba19a2f694fe6150451a759 \
+    --hash=sha256:c228a6dc5e932d346bc5739379109d49e8853dd8223571c7c5b55260edc0b97f
+    # via
+    #   -c requirements/dev.txt
+    #   -c requirements/main.txt
+    #   pyproject-api
+    #   tox
+    #   tox-uv
+platformdirs==4.3.6 \
+    --hash=sha256:357fb2acbc885b0419afd3ce3ed34564c13c9b95c89360cd9563f73aa5e2b907 \
+    --hash=sha256:73e575e1408ab8103900836b97580d5307456908a03e92031bab39e4554cc3fb
+    # via
+    #   -c requirements/dev.txt
+    #   tox
+    #   virtualenv
+pluggy==1.5.0 \
+    --hash=sha256:2cffa88e94fdc978c4c574f15f9e59b7f4201d439195c3715ca9e2486f1d0cf1 \
+    --hash=sha256:44e1ad92c8ca002de6377e165f3e0f1be63266ab4d554740532335b9d75ea669
+    # via
+    #   -c requirements/dev.txt
+    #   tox
+pyproject-api==1.8.0 \
+    --hash=sha256:3d7d347a047afe796fd5d1885b1e391ba29be7169bd2f102fcd378f04273d228 \
+    --hash=sha256:77b8049f2feb5d33eefcc21b57f1e279636277a8ac8ad6b5871037b243778496
+    # via tox
+tox==4.23.2 \
+    --hash=sha256:452bc32bb031f2282881a2118923176445bac783ab97c874b8770ab4c3b76c38 \
+    --hash=sha256:86075e00e555df6e82e74cfc333917f91ecb47ffbc868dcafbd2672e332f4a2c
+    # via
+    #   -r requirements/tox.in
+    #   tox-uv
+tox-uv==1.16.0 \
+    --hash=sha256:71b2e2fa6c35c1360b91a302df1d65b3e5a1f656b321c5ebf7b84545804c9f01 \
+    --hash=sha256:e6f0b525a687e745ab878d07cbf5c7e85d582028d4a7c8935f95e84350651432
+    # via -r requirements/tox.in
+uv==0.5.6 \
+    --hash=sha256:152466b8854bc30661620671cd1e5e854123e734fb4f380bc83eab5e3c4450a9 \
+    --hash=sha256:2b1dc05b9b242989d4a6dc99916a0fd6dc98ea5146f757505da69ac20825067d \
+    --hash=sha256:485decff72ba2ba6c8b82de0f8ecc877bd4080dc4e27604f3ebd9da98e00c53f \
+    --hash=sha256:4ca83b575d316030503d81d3cc85a53be45d8bab56892f845f7e545006e5df59 \
+    --hash=sha256:5b49db3c842dcdaccdaf8ea26770c2b18632528f68e7f3211415ae25796de71a \
+    --hash=sha256:6c7afc715f48a6ddc61257ed62c74595b5762eb67a6f23696fae6e609698a990 \
+    --hash=sha256:6e13c1bb1f00b596a50711afffc407570edf9825fea4cfbc1d80cfb59816e501 \
+    --hash=sha256:6e14da824a775abe4f28f03c4a672df99697fdd42c5e99df40d99a7d5c90e5c8 \
+    --hash=sha256:848b12fe47ee8dd871ae5cfb1fefc2bac7cdb90bd34ff1f08bf78dd751f6950a \
+    --hash=sha256:87b0b77ebf036363b8b0ed55c0f4a4a687b20500e3f9aa45574dfe05f9761057 \
+    --hash=sha256:8bc30ef6996c3352a45d75ebc9aeb2e7ae5ebb7b2118b6f036ddd02d4f689daa \
+    --hash=sha256:920dd926d235f826454e7b68cb1890ded6e67510e6195c346eef41caabc9d9b7 \
+    --hash=sha256:9297f084ca2004044a9353525777c9cb1151a0d768de87cc3920574597674f88 \
+    --hash=sha256:9c1ebf58ef3906e05e0060cda4a801a45e93334169821a89effa6ba9607dfa07 \
+    --hash=sha256:a15ac68584b346e592ca4c5167ffd4c4ba9906706b423b696e7b37d03dea753b \
+    --hash=sha256:c1a3b180e90734812034cc1594256f519bff6c2715f3f1ceb9ac7bc578005f5d \
+    --hash=sha256:eae7301bd35891545a4e139b0f1bd5aa7981afba43654233297be463d6d6ba8b \
+    --hash=sha256:f2e6a13da16b8a3a43d50a1be5910c4e55b04889bcacfb8c9a22dcff817fa326
+    # via tox-uv
+virtualenv==20.28.0 \
+    --hash=sha256:23eae1b4516ecd610481eda647f3a7c09aea295055337331bb4e6892ecce47b0 \
+    --hash=sha256:2c9c3262bb8e7b87ea801d715fae4495e6032450c71d2309be9550e7364049aa
+    # via
+    #   -c requirements/dev.txt
+    #   tox

tox.ini

@@ -33,4 +33,4 @@ commands = pre-commit run --all-files
 [testenv:run]
 description = Run the development server with auto-reload for code changes.
 usedevelop = true
-commands = uvicorn tobyjdemoapp.main:app --reload
+commands = uvicorn tobyjdemoapp.main:app --port 6502 --reload