From 46b8adb31617cc0f2f33d362a4a29501eacc95b7 Mon Sep 17 00:00:00 2001 From: Artur Shiriev Date: Tue, 9 Jun 2026 16:34:38 +0300 Subject: [PATCH 1/2] ci: align with modern-di MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Bump pins: checkout@v4 → @v6, setup-just@v2 → @v4, setup-uv@v3 → @v8.2.0 across ci.yml and publish.yml. - Drop codecov upload step from ci.yml. Coverage floor enforced by --cov-fail-under in pyproject.toml; modern-di also dropped codecov. - Split ci.yml into thin trigger wrapper + reusable _checks.yml (workflow_call). Sets the shape up to add more callers later. Resulting ci.yml/_checks.yml/publish.yml are byte-identical to lite-bootstrap's post-PR #115 state. Co-Authored-By: Claude Opus 4.7 (1M context) --- .github/workflows/_checks.yml | 38 +++++++++++++++++++++++++++++++ .github/workflows/ci.yml | 43 ++--------------------------------- .github/workflows/publish.yml | 6 ++--- 3 files changed, 43 insertions(+), 44 deletions(-) create mode 100644 .github/workflows/_checks.yml diff --git a/.github/workflows/_checks.yml b/.github/workflows/_checks.yml new file mode 100644 index 0000000..88908af --- /dev/null +++ b/.github/workflows/_checks.yml @@ -0,0 +1,38 @@ +name: checks +on: + workflow_call: {} + +jobs: + lint: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v6 + - uses: extractions/setup-just@v4 + - uses: astral-sh/setup-uv@v8.2.0 + with: + enable-cache: true + cache-dependency-glob: "**/pyproject.toml" + - run: uv python install 3.10 + - run: just install lint-ci + + pytest: + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + python-version: + - "3.10" + - "3.11" + - "3.12" + - "3.13" + - "3.14" + steps: + - uses: actions/checkout@v6 + - uses: extractions/setup-just@v4 + - uses: astral-sh/setup-uv@v8.2.0 + with: + enable-cache: true + cache-dependency-glob: "**/pyproject.toml" + - run: uv python install ${{ matrix.python-version }} + - run: just install + - run: just test . --cov=. --cov-report xml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0f58873..85af5ea 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,5 +1,4 @@ name: main - on: push: branches: @@ -11,43 +10,5 @@ concurrency: cancel-in-progress: true jobs: - lint: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: extractions/setup-just@v2 - - uses: astral-sh/setup-uv@v3 - with: - enable-cache: true - cache-dependency-glob: "**/pyproject.toml" - - run: uv python install 3.10 - - run: just install lint-ci - - pytest: - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - python-version: - - "3.10" - - "3.11" - - "3.12" - - "3.13" - - "3.14" - steps: - - uses: actions/checkout@v4 - - uses: extractions/setup-just@v2 - - uses: astral-sh/setup-uv@v3 - with: - enable-cache: true - cache-dependency-glob: "**/pyproject.toml" - - run: uv python install ${{ matrix.python-version }} - - run: just install - - run: just test . --cov=. --cov-report xml - - uses: codecov/codecov-action@v4.0.1 - env: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - with: - files: ./coverage.xml - flags: unittests - name: codecov-${{ matrix.python-version }} + checks: + uses: ./.github/workflows/_checks.yml diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index b637272..916fc36 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -9,9 +9,9 @@ jobs: publish: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - uses: extractions/setup-just@v2 - - uses: astral-sh/setup-uv@v3 + - uses: actions/checkout@v6 + - uses: extractions/setup-just@v4 + - uses: astral-sh/setup-uv@v8.2.0 - run: just publish env: PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }} From 0ed764c91eb146e1e0b039b253c4771abcdf81d9 Mon Sep 17 00:00:00 2001 From: Artur Shiriev Date: Tue, 9 Jun 2026 16:46:27 +0300 Subject: [PATCH 2/2] docs: point Documentation link at modern-di.modern-python.org modern-di's docs moved from Read the Docs to GitHub Pages (modern-di.modern-python.org). Updates the docs URL in pyproject.toml and the Documentation link in README.md to match. --- README.md | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6a183c8..dbb9137 100644 --- a/README.md +++ b/README.md @@ -15,4 +15,4 @@ Browse the full list of templates and libraries in [`modern-python`](https://github.com/modern-python) — see the org profile for the categorized index. -## 📚 [Documentation](https://modern-di.readthedocs.io) +## 📚 [Documentation](https://modern-di.modern-python.org) diff --git a/pyproject.toml b/pyproject.toml index d441290..e115700 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -20,7 +20,7 @@ version = "0" [project.urls] repository = "https://github.com/modern-python/modern-di-fastapi" -docs = "https://modern-di.readthedocs.io" +docs = "https://modern-di.modern-python.org" [dependency-groups] dev = [