From 8810b60719d09a865f825166a4743d46f9609eb7 Mon Sep 17 00:00:00 2001 From: Artur Shiriev Date: Sat, 24 Oct 2026 13:23:39 +0300 Subject: [PATCH] ci: test floors the CI10 way and collapse the wheel-only floors --- .github/workflows/_checks.yml | 10 ++++++---- pyproject.toml | 6 ++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/_checks.yml b/.github/workflows/_checks.yml index 2fb9c16..486866a 100644 --- a/.github/workflows/_checks.yml +++ b/.github/workflows/_checks.yml @@ -42,9 +42,8 @@ jobs: floors: # Every other job resolves newest, so the declared floors are a claim nothing installs. - # This one resolves the bottom of each range, on every matrix entry: wheel coverage is - # per interpreter, so two interpreters resolving the same versions can still disagree - # on whether those versions install. + # This one installs them exactly on the floor Python, and the lowest versions with a wheel + # on every other entry (CI10). if: github.event_name != 'schedule' runs-on: ubuntu-latest strategy: @@ -66,7 +65,10 @@ jobs: - run: uv python pin ${{ matrix.python-version }} - run: uv venv # Pinned with builds allowed, so a floor with no wheel fails the wheel-only install below. - - run: uv pip compile pyproject.toml --all-extras --no-deps --resolution lowest-direct -o floors.txt + - if: matrix.python-version == '3.11' + run: uv pip compile pyproject.toml --all-extras --no-deps --resolution lowest-direct -o floors.txt + - if: matrix.python-version != '3.11' + run: uv pip compile pyproject.toml --all-extras --resolution lowest-direct --no-build -o floors.txt - run: uv pip install -r pyproject.toml --all-extras --group dev --constraints floors.txt --no-build - run: uv run --no-sync pytest diff --git a/pyproject.toml b/pyproject.toml index 7f6bb5f..45e2ee4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -18,10 +18,8 @@ classifiers = [ "Topic :: Software Development :: Libraries", ] dependencies = [ - # The committed test stubs under tests/protos refuse to import below 1.82.1, and grpcio ships - # no cp315 wheel before 1.84. - "grpcio>=1.82.1,<2; python_version < '3.15'", - "grpcio>=1.84,<2; python_version >= '3.15'", + # The committed test stubs under tests/protos refuse to import below 1.82.1. + "grpcio>=1.82.1,<2", "modern-di>=4.2,<5", ] version = "0"