From 46307f2d206bf1ffc728df3ad87daca640e107bd Mon Sep 17 00:00:00 2001 From: ***** <721466+soodoku@users.noreply.github.com> Date: Sun, 20 Sep 2026 17:02:24 -0700 Subject: [PATCH 1/2] Repair dependency CI and separate research tests from wheel tests --- .github/workflows/ci.yml | 9 ++++++--- .../tests}/test_estimated_validation.py | 0 pyproject.toml | 12 +++++++++--- 3 files changed, 15 insertions(+), 6 deletions(-) rename {tests => experiments/tests}/test_estimated_validation.py (100%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3b0230e..7139375 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,6 +4,7 @@ on: push: branches: [main] pull_request: + workflow_dispatch: schedule: - cron: "17 6 * * 1" @@ -16,7 +17,7 @@ concurrency: jobs: package: - uses: gojiplus/py-canon/.github/workflows/reusable-ci.yml@07c6621880b82afd28ab7230eab6e79f96d080e3 # v1 + uses: gojiplus/py-canon/.github/workflows/reusable-ci.yml@6381ef50660166e3836a2e687f81b5f9b5640b2e # v1 with: wheel-import: queue_shift @@ -25,7 +26,7 @@ jobs: timeout-minutes: 30 steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - - uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0 + - uses: astral-sh/setup-uv@bec219d24cd3e171d82865faccec33120bb574f4 # v10.1.0 - name: Sync environment run: uv sync --frozen --all-groups --all-extras - name: Install TeX @@ -33,4 +34,6 @@ jobs: sudo apt-get update sudo apt-get install --yes texlive-latex-extra texlive-bibtex-extra - name: Check research artifacts - run: make research-check + run: | + uv run pytest experiments/tests + make research-check diff --git a/tests/test_estimated_validation.py b/experiments/tests/test_estimated_validation.py similarity index 100% rename from tests/test_estimated_validation.py rename to experiments/tests/test_estimated_validation.py diff --git a/pyproject.toml b/pyproject.toml index 3d06aa0..b58e698 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -38,7 +38,7 @@ Issues = "https://github.com/finite-sample/queue-shift/issues" Repository = "https://github.com/finite-sample/queue-shift" [build-system] -requires = ["uv_build>=0.12.3,<0.13"] +requires = ["uv_build>=0.12.5,<0.13"] build-backend = "uv_build" [tool.uv.build-backend] @@ -79,6 +79,7 @@ convention = "google" [tool.ruff.lint.per-file-ignores] "tests/**" = ["S101", "D", "ARG", "SLF"] "experiments/**" = ["T201"] +"experiments/tests/**" = ["S101", "D", "ARG", "SLF"] "experiments/analyze_*.py" = ["E501"] [tool.pyright] @@ -86,16 +87,21 @@ include = ["src"] typeCheckingMode = "standard" [tool.pydoclint] +exclude = '\.venv|tests|docs|experiments' style = "google" arg-type-hints-in-docstring = false check-return-types = false check-class-attributes = false allow-init-docstring = true -exclude = '\\.venv|tests|experiments' [tool.pytest.ini_options] +minversion = "8" +log_level = "INFO" +xfail_strict = true +addopts = "-ra --strict-config --strict-markers" +filterwarnings = ["error"] pythonpath = ["."] -testpaths = ["tests"] +testpaths = ["tests", "experiments/tests"] [tool.coverage.run] source = ["src"] From e0b0b755e4f9016b4da08a7228102c7a0229fdf5 Mon Sep 17 00:00:00 2001 From: ***** <721466+soodoku@users.noreply.github.com> Date: Sun, 20 Sep 2026 17:09:28 -0700 Subject: [PATCH 2/2] Declare custom research workflow ownership --- pyproject.toml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index b58e698..8f19846 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -105,3 +105,7 @@ testpaths = ["tests", "experiments/tests"] [tool.coverage.run] source = ["src"] + +[tool.preen] +# Custom research workflows are maintained here rather than generated by Copier. +skip_checks = ["template"]