From 0092931e353b5618242dcbb6117ed2c9015012ee Mon Sep 17 00:00:00 2001 From: iback Date: Thu, 14 Nov 2024 12:49:17 +0000 Subject: [PATCH 1/7] added tptbox to dev dependency --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 7d40b1a..b4f6443 100755 --- a/pyproject.toml +++ b/pyproject.toml @@ -39,6 +39,7 @@ rich = "^13.6.0" [tool.poetry.dev-dependencies] pytest = "^7.4.4" pre-commit = "*" +tptbox = "^0.2.1" [tool.poetry-dynamic-versioning] From 28550af9c452cffd454be75444aaed2995a12eb7 Mon Sep 17 00:00:00 2001 From: iback Date: Thu, 14 Nov 2024 12:52:55 +0000 Subject: [PATCH 2/7] added tptbox to dev dependency --- pyproject.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index b4f6443..9f7b067 100755 --- a/pyproject.toml +++ b/pyproject.toml @@ -31,7 +31,7 @@ torchmetrics = "^1.1.2" tqdm = "^4.66.1" einops= "^0.6.1" nnunetv2 = "2.4.2" -tptbox = "^0.2.1" +TPTBox = "^0.2.1" antspyx = "0.4.2" rich = "^13.6.0" @@ -39,7 +39,6 @@ rich = "^13.6.0" [tool.poetry.dev-dependencies] pytest = "^7.4.4" pre-commit = "*" -tptbox = "^0.2.1" [tool.poetry-dynamic-versioning] From 7d97ef271592428bcc1135d1751c9b9ba54357c3 Mon Sep 17 00:00:00 2001 From: iback Date: Thu, 14 Nov 2024 12:57:33 +0000 Subject: [PATCH 3/7] fix workflow --- .github/workflows/tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4ca3500..9a0c1a0 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -25,6 +25,7 @@ jobs: uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} + cache: "pip" - name: Configure python run: | python -m pip install --upgrade pip @@ -44,7 +45,7 @@ jobs: pytest - name: Test with pytest and create coverage report run: | - python -m poetry run coverage run --source=TPTBox -m pytest + python -m poetry run coverage run --source=spineps -m pytest python -m poetry run coverage xml - name: Upload coverage results to Codecov (Only on merge to main) # Only upload to Codecov after a merge to the main branch From f457f54278b70862c554c6807058b2312e427d4e Mon Sep 17 00:00:00 2001 From: iback Date: Thu, 14 Nov 2024 12:58:15 +0000 Subject: [PATCH 4/7] fix workflow --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9a0c1a0..ad4f09e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -45,7 +45,7 @@ jobs: pytest - name: Test with pytest and create coverage report run: | - python -m poetry run coverage run --source=spineps -m pytest + python -m poetry run coverage run --source=SPINEPS -m pytest python -m poetry run coverage xml - name: Upload coverage results to Codecov (Only on merge to main) # Only upload to Codecov after a merge to the main branch From 175f2fbcbca86f376e4e31d96c88e0a53b44b60d Mon Sep 17 00:00:00 2001 From: iback Date: Thu, 14 Nov 2024 13:04:34 +0000 Subject: [PATCH 5/7] fix workflow --- .github/workflows/tests.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ad4f09e..958c656 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -40,13 +40,10 @@ jobs: flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics - - name: Test with pytest + - name: Test with pytest and create coverage report run: | - pytest - - name: Test with pytest and create coverage report - run: | - python -m poetry run coverage run --source=SPINEPS -m pytest - python -m poetry run coverage xml + python -m poetry run coverage run --source=SPINEPS -m pytest + python -m poetry run coverage xml - name: Upload coverage results to Codecov (Only on merge to main) # Only upload to Codecov after a merge to the main branch if: github.ref == 'refs/heads/main' && github.event_name == 'push' From 19aea8c41e066de0bb2e13cfc13dd4bebdc1492c Mon Sep 17 00:00:00 2001 From: iback Date: Thu, 14 Nov 2024 13:09:24 +0000 Subject: [PATCH 6/7] fix workflow --- pyproject.toml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index 9f7b067..a7aedb1 100755 --- a/pyproject.toml +++ b/pyproject.toml @@ -39,6 +39,14 @@ rich = "^13.6.0" [tool.poetry.dev-dependencies] pytest = "^7.4.4" pre-commit = "*" +coverage = ">=7.0.1" +pytest-mock = "^3.6.0" +pandas = "^2.1.0" +joblib = "^1.3.2" +future = "^0.18.3" +flake8 = ">=4.0.1" +auxiliary = ">=0.1.0" +tqdm = ">=4.62.3" [tool.poetry-dynamic-versioning] From 6164a78875e220bd9217a83525c1cf56446237ea Mon Sep 17 00:00:00 2001 From: iback Date: Thu, 14 Nov 2024 13:13:27 +0000 Subject: [PATCH 7/7] fix workflow --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 958c656..6a51708 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -42,7 +42,7 @@ jobs: flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics - name: Test with pytest and create coverage report run: | - python -m poetry run coverage run --source=SPINEPS -m pytest + python -m poetry run coverage run --source=spineps -m pytest python -m poetry run coverage xml - name: Upload coverage results to Codecov (Only on merge to main) # Only upload to Codecov after a merge to the main branch