Wireup vNext API Modernization

.github/workflows/run_all.yml

@@ -4,8 +4,45 @@ on:
     branches: ["master"]
   pull_request:
     branches: ["master"]
+
 jobs:
-  build:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.8"
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
+      - name: Install dependencies
+        run: make install
+      - name: Lint
+        run: make check-ruff
+      - name: Check formatting
+        run: make check-fmt
+      - name: Check typing
+        run: make check-mypy
+
+  docs:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.14"
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
+      - name: Install dependencies
+        run: make install
+      - name: Check documentation
+        run: make check-docs
+      - name: Build documentation
+        run: make build-docs
+
+  test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -16,15 +53,9 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
-      - name: Create venv
-        run: python -m venv .venv
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
       - name: Install dependencies
         run: make install
-      - name: Lint
-        run: make check-ruff
-      - name: Check typing
-        run: make check-mypy
-      - name: Check formatting
-        run: make check-fmt
       - name: Run tests
         run: make test

.github/workflows/run_integration_tests.yml

@@ -15,10 +15,9 @@ jobs:
       uses: actions/setup-python@v4
       with:
         python-version: "3.13"
-    - name: Create venv
-      run: python -m venv .venv
+    - name: Install uv
+      uses: astral-sh/setup-uv@v5
     - name: Install dependencies
-      run: |
-        make install
+      run: make install
     - name: Run tox
-      run: .venv/bin/tox
+      run: uv run tox

Makefile

@@ -1,41 +1,51 @@
-.PHONY: install lint check-fmt check-ruff check-mypy test profile fix format docs-deploy
+.PHONY: install lint check-fmt check-ruff check-mypy test profile fix format docs-deploy publish
 
 ifdef GITHUB_ACTIONS
 RUFF_ARGS := --output-format github
 endif
 
 install:
-	.venv/bin/python -m pip install --upgrade pip
-	.venv/bin/pip install poetry
-	.venv/bin/poetry install --no-root
+	pip install uv
+	uv sync --group dev
 
-lint: check-fmt check-ruff check-mypy
+lint: check-fmt check-ruff check-mypy check-docs
 
 check-fmt:
-	.venv/bin/ruff format . --check
+	uv run ruff format . --check
 
 check-ruff:
-	.venv/bin/ruff check wireup test $(RUFF_ARGS)
+	uv run ruff check wireup test $(RUFF_ARGS)
 
 check-mypy:
-	.venv/bin/mypy wireup --strict
+	uv run mypy wireup --strict
+
+check-docs:
+	find docs -name "*.md" -not -path "docs/pages/class/*" | xargs uv run --python 3.14 mdformat --wrap 120 --check
 
 test:
-	.venv/bin/pytest test/unit
+	uv run pytest test/unit
 
 profile ./profile_tests $(num_runs):
-	./.venv/bin/python ./profile_tests.py $(num_runs)
+	uv run python ./profile_tests.py $(num_runs)
 
-format:
-	./.venv/bin/ruff format .
+format: format-docs
+	uv run ruff format .
 
 fix:
-	./.venv/bin/ruff wireup --fix
+	uv run ruff wireup --fix
+
+format-docs:
+	find docs -name "*.md" -not -path "docs/pages/class/*" | xargs uv run --python 3.14 mdformat --wrap 120
+	find docs -name "*.md" -not -path "docs/pages/class/*" | xargs uv run --python 3.14 blacken-docs -l 80 || true
+
+build-docs:
+	uv run --python 3.14 mkdocs build --strict -f docs/mkdocs.yml
+
 
 # make docs-deploy version=...
 docs-deploy $(version):
-	cd docs && ../.venv/bin/mike deploy --push --update-aliases $(version) latest
+	cd docs && uv run mike deploy --push --update-aliases $(version) latest
 
 publish:
-	./.venv/bin/poetry build
-	./.venv/bin/poetry publish
+	uv build
+	uv publish

docs/mkdocs.yml

@@ -1,27 +1,23 @@
 site_name: Wireup
 nav:
   - 📚 Documentation:
-    - Wireup: index.md
-    - Getting Started: getting_started.md
-    - Basics:
-      - Container: container.md
-      - Services: services.md
-      - Configuration: parameters.md
+    - Introduction:
+      - Overview: index.md
+      - Getting Started: getting_started.md
     - Core Concepts:
+      - Container: container.md
+      - Injectables: injectables.md
+      - Configuration: configuration.md
+    - Advanced Features:
+      - Lifetimes & Scopes: lifetimes_and_scopes.md
       - Factories: factories.md
-      - Annotations: annotations.md
+      - Resource Management: resources.md
       - Interfaces: interfaces.md
-      - Lifetimes & Scopes: lifetimes_and_scopes.md
+      - Function Injection: function_injection.md
     - Guides:
-      - Function Injection: apply_container_as_decorator.md
-      - Clean Domain Code: annotation_free.md
-      - Multiple registrations: multiple_registrations.md
       - Testing: testing.md
-    - Misc:
-      - Use with __future__ annotations: future_annotations.md
-      - Tips & Tricks: tips_tricks.md
-      - Versioning: versioning.md
       - Upgrading: upgrading.md
+      - Versioning: versioning.md
 
   - Integrations:
     - Integrations: integrations/index.md
@@ -45,7 +41,7 @@ nav:
   - API Reference:
       - wireup: class/wireup.md
       - OverrideManager: class/override_manager.md
-      - ParameterBag: class/parameter_bag.md
+      - ConfigStore: class/config_store.md
       - Integrations:
         - Django: class/django_integration.md
         - FastAPI: class/fastapi_integration.md
@@ -66,7 +62,6 @@ theme:
     - content.code.annotate
     - navigation.instant
     - navigation.tabs
-    - navigation.footer
     - navigation.indexes
   font:
     code: JetBrains Mono