From 1ec683937ae0dde121e18156456b16408ed8ad2e Mon Sep 17 00:00:00 2001 From: Wytamma Wirth <wytamma.wirth@me.com> Date: Mon, 22 Apr 2024 18:14:12 +1000 Subject: [PATCH] :white_check_mark: collapse test matrix --- .github/workflows/tests.yml | 7 ++----- pyproject.toml | 17 +++-------------- 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 87ac102..a4b948f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -29,12 +29,9 @@ jobs: - run: pip install hatch - run: sudo apt-get update && sudo apt-get install -y llvm - run: sudo apt-get -y install graphviz - - name: Run v7 tests + - name: Run tests shell: bash - run: hatch run +py=3.11 v7:cov - - name: Run v8 tests - shell: bash - run: hatch run +py=3.11 v8:cov + run: hatch run snakemake:cov - name: Upload coverage reports to Codecov uses: codecov/codecov-action@v3 diff --git a/pyproject.toml b/pyproject.toml index ee0e5c9..8ad4404 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -43,21 +43,10 @@ Source = "https://github.com/unknown/snk-cli" path = "src/snk_cli/__about__.py" -[[tool.hatch.envs.v7.matrix]] -python = ["3.9", "3.10", "3.11", "3.12"] -snakemake = ["7.32.4"] - -[tool.hatch.v7.test] -dependencies = [ - "coverage[toml]>=6.5", - "pytest", - "snakemake=={matrix:snakemake}"] - -[[tool.hatch.envs.v8.matrix]] -python = ["3.11", "3.12"] -snakemake = ["8.10.8"] +[[tool.hatch.envs.snakemake.matrix]] +snakemake = ["7.32.4", "8.10.8"] -[tool.hatch.v8.test] +[tool.hatch.snakemake.test] dependencies = [ "coverage[toml]>=6.5", "pytest",