From 9ed35953c72be4faa929a7f7bebb3c4ea50375a5 Mon Sep 17 00:00:00 2001 From: Jeff Rhoades <37990507+rhoadesScholar@users.noreply.github.com> Date: Thu, 14 Mar 2024 10:43:11 -0400 Subject: [PATCH 1/4] Update tests.yaml --- .github/workflows/tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 61aa624..8a4319b 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -23,7 +23,7 @@ jobs: pip install ".[dev]" - name: Test with pytest run: | - pytest --color=yes --cov={{cookiecutter.project_slug}} --cov-report=xml --cov-report=term-missing tests + pytest # --color=yes --cov={{cookiecutter.project_slug}} --cov-report=xml --cov-report=term-missing tests # Coverage should work out of the box for public repos. For private repos, more setup is likely required. - name: Coverage uses: codecov/codecov-action@v4 From a71a1832001d2a81e04cfeb3830e8eb1e3fc5dcf Mon Sep 17 00:00:00 2001 From: Jeff Rhoades <37990507+rhoadesScholar@users.noreply.github.com> Date: Thu, 14 Mar 2024 10:51:00 -0400 Subject: [PATCH 2/4] Update tests.yaml --- .github/workflows/tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 8a4319b..61aa624 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -23,7 +23,7 @@ jobs: pip install ".[dev]" - name: Test with pytest run: | - pytest # --color=yes --cov={{cookiecutter.project_slug}} --cov-report=xml --cov-report=term-missing tests + pytest --color=yes --cov={{cookiecutter.project_slug}} --cov-report=xml --cov-report=term-missing tests # Coverage should work out of the box for public repos. For private repos, more setup is likely required. - name: Coverage uses: codecov/codecov-action@v4 From da0495cb044eabac37d5df5f79b09755b5df3bde Mon Sep 17 00:00:00 2001 From: rhoadesScholar Date: Thu, 14 Mar 2024 10:53:09 -0400 Subject: [PATCH 3/4] =?UTF-8?q?test:=20=E2=9C=85=20Change=20cosem=20model?= =?UTF-8?q?=20loading.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change cosem model loading to replace "." with "_" in model name path, in hopes of passing GitHub Actions tests. --- .../__pycache__/__init__.cpython-310.pyc | Bin 313 -> 313 bytes .../__pycache__/utils.cpython-310.pyc | Bin 1579 -> 1579 bytes .../pytorch/cosem/load_model.py | 6 ++++-- .../pytorch/cosem/setup26.1/.DS_Store | Bin 6148 -> 0 bytes .../{setup26.1 => setup26_1}/__init__.py | 0 .../cosem/{setup26.1 => setup26_1}/model.py | 0 6 files changed, 4 insertions(+), 2 deletions(-) delete mode 100644 src/cellmap_models/pytorch/cosem/setup26.1/.DS_Store rename src/cellmap_models/pytorch/cosem/{setup26.1 => setup26_1}/__init__.py (100%) rename src/cellmap_models/pytorch/cosem/{setup26.1 => setup26_1}/model.py (100%) diff --git a/src/cellmap_models/__pycache__/__init__.cpython-310.pyc b/src/cellmap_models/__pycache__/__init__.cpython-310.pyc index e649df2c0ccf6054e0a9f07b82b1ca906609b885..073ba4811630152fc9fd9df46c605e117b42ee3b 100644 GIT binary patch delta 60 zcmdnVw3CTDpO=@50SG3rf1b#_l=0TYjfx8FKzSlbC@C#IwpXXyu} L7UUOC{NxS*;(rob diff --git a/src/cellmap_models/__pycache__/utils.cpython-310.pyc b/src/cellmap_models/__pycache__/utils.cpython-310.pyc index ee0ed8d90c502bc4f7a146695a86e272725cde0a..5ec9723fe3183450abc3e80bf39d620cab5594b7 100644 GIT binary patch delta 190 zcmZ3@vzmuHpO=@50SG3rf8NMFgPHNx zUk>_tMaBBbsW~~hi3R#a8TpARsl{27jad67wSn@Qj3JurMZ!Q torch.nn.Module: ): if checkpoint_name in model_names: checkpoint_path = Path( - Path(__file__).parent / Path(checkpoint_name) / "model.py" + Path(__file__).parent + / Path(checkpoint_name.replace(".", "_")) + / "model.py" ) no_weights = True else: raise ValueError(f"Model {checkpoint_name} not found") else: checkpoint_path = Path( - Path(__file__).parent / Path(checkpoint_name) + Path(__file__).parent / Path(checkpoint_name.replace(".", "_")) ).with_suffix(".pth") if not checkpoint_path.exists(): url = models_dict[checkpoint_name] diff --git a/src/cellmap_models/pytorch/cosem/setup26.1/.DS_Store b/src/cellmap_models/pytorch/cosem/setup26.1/.DS_Store deleted file mode 100644 index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0 Date: Thu, 14 Mar 2024 11:01:45 -0400 Subject: [PATCH 4/4] Update tests.yaml --- .github/workflows/tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 61aa624..cae0eb5 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -23,7 +23,7 @@ jobs: pip install ".[dev]" - name: Test with pytest run: | - pytest --color=yes --cov={{cookiecutter.project_slug}} --cov-report=xml --cov-report=term-missing tests + pytest --color=yes --cov=cellmap_models --cov-report=xml --cov-report=term-missing tests # Coverage should work out of the box for public repos. For private repos, more setup is likely required. - name: Coverage uses: codecov/codecov-action@v4