Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PathML 3.0.0: New Features and User Experience Improvements #427

Merged
merged 363 commits into from
Mar 20, 2024
Merged
Show file tree
Hide file tree
Changes from 250 commits
Commits
Show all changes
363 commits
Select commit Hold shift + click to select a range
5138a99
Fixed precommit hook errors
sreekarreddydfci Nov 15, 2023
4285abc
pull changes
sreekarreddydfci Nov 15, 2023
19d37be
fixed precommit hook errors, and updated qupath download url
sreekarreddydfci Nov 15, 2023
6472fa1
Update tests-conda.yml
sreekarreddydfci Nov 15, 2023
4dfcf4e
Update tests-conda.yml
sreekarreddydfci Nov 15, 2023
6a5e278
Update tests-conda.yml
sreekarreddydfci Nov 15, 2023
a4967cc
Update tests-conda.yml
sreekarreddydfci Nov 15, 2023
d3c67b7
Update tests-conda.yml
sreekarreddydfci Nov 15, 2023
e9ab3ad
Update tests-conda.yml
sreekarreddydfci Nov 15, 2023
540228f
Update tests-conda.yml
sreekarreddydfci Nov 15, 2023
40eb661
Update tests-conda.yml
sreekarreddydfci Nov 15, 2023
f6d0925
Update tests-conda.yml
sreekarreddydfci Nov 15, 2023
4753100
Update tests-conda.yml
sreekarreddydfci Nov 15, 2023
8335caa
Update tests-conda.yml
sreekarreddydfci Nov 15, 2023
cfc7948
Update readthedocs-requirements.txt
sreekarreddydfci Nov 15, 2023
70620dc
Update readthedocs-requirements.txt
sreekarreddydfci Nov 15, 2023
ac03714
Added new tests for hactnet
VarunUllanat Nov 15, 2023
2729849
Update precommit-hooks.yaml
sreekarreddydfci Nov 15, 2023
4b6d1d5
Added tests for graph preprocessing and dataset feature extraction"
VarunUllanat Nov 15, 2023
374f8c1
Added new graph utils tests
VarunUllanat Nov 16, 2023
4952436
bugfix in colab installation instructions in README.md
Dana-Farber Nov 17, 2023
4196fa3
Merge pull request #376 from Dana-Farber-AIOS/Dana-Farber-patch-1
Dana-Farber Nov 17, 2023
dd61eea
Update readthedocs-requirements.txt (#377)
sreekarreddydfci Nov 20, 2023
a3011b3
changing torch version
jamesgwen Nov 22, 2023
6aefb39
Merge pull request #378 from VarunUllanat/dev_graph
VarunUllanat Nov 22, 2023
cc58118
Cleaned up code and fixed pre-commit errors
VarunUllanat Nov 22, 2023
7c92d9f
Cleaned up files and added comments and docstrings
VarunUllanat Nov 24, 2023
9d6723e
add test cases
sreekarreddydfci Nov 29, 2023
3274101
reformatted pathml/datasets/datasets.py
VarunUllanat Nov 29, 2023
346612e
removed torchvision dependency in environment.yml
VarunUllanat Nov 29, 2023
69fe55e
Merge branch 'dev_graph' into dev_graph
VarunUllanat Nov 29, 2023
1c1778c
Removed unused import in graph_tests
VarunUllanat Nov 29, 2023
7abc289
Merge branch 'dev_graph' of https://github.com/VarunUllanat/pathml in…
VarunUllanat Nov 29, 2023
644d3f2
Merge pull request #379 from VarunUllanat/dev_graph
VarunUllanat Nov 29, 2023
d1cb59d
Merge branch 'tilestitching-dev2' into dev-tilestitching
sreekarreddydfci Nov 29, 2023
23e5e30
added tilestitching code
sreekarreddydfci Nov 29, 2023
687a855
cleaned docs requirement file
sreekarreddydfci Nov 29, 2023
08d2a6f
Remove tools folder
sreekarreddydfci Nov 29, 2023
f8b89cd
Remove torchvision dependency in tests and added nn.Module input for …
VarunUllanat Nov 30, 2023
b1b0b29
Merge pull request #380 from VarunUllanat/dev_graph
VarunUllanat Nov 30, 2023
ceaa119
Merge remote-tracking branch 'upstream/dev_graph' into dev-tilestitching
sreekarreddydfci Nov 30, 2023
66b955e
merged latest changes
sreekarreddydfci Nov 30, 2023
f7cf0c1
merged latest changes
sreekarreddydfci Nov 30, 2023
9d0e576
Update environment.yml
sreekarreddydfci Nov 30, 2023
d6d4576
Update environment.yml
sreekarreddydfci Nov 30, 2023
ced4373
Update environment.yml
sreekarreddydfci Nov 30, 2023
591caaf
fixed typos in example notebook
jamesgwen Nov 30, 2023
4ad79e5
Make flake8 compliant
VarunUllanat Dec 1, 2023
44c33f2
Merge pull request #381 from VarunUllanat/dev_graph
VarunUllanat Dec 1, 2023
bbf35bf
Updated environment.yml to include flexible numpy and scipy versions
VarunUllanat Dec 1, 2023
aa10b26
Merge pull request #383 from VarunUllanat/dev_graph
VarunUllanat Dec 1, 2023
da844df
Added capabilities for all possible versions of skimage and flake8 co…
VarunUllanat Dec 1, 2023
5a9d7d4
Merge pull request #385 from VarunUllanat/dev_graph
VarunUllanat Dec 1, 2023
3944c80
Changes spams installation in github workflows
VarunUllanat Dec 2, 2023
75f119d
Merge pull request #387 from VarunUllanat/dev_graph
VarunUllanat Dec 2, 2023
b027168
Updated skimage version for importing the graph module
VarunUllanat Dec 2, 2023
fc0e8b3
Merge pull request #389 from VarunUllanat/dev_graph
VarunUllanat Dec 2, 2023
fc30a01
merging graphapi with tilestitching
sreekarreddydfci Dec 2, 2023
19def08
Modified skimage graph import
sreekarreddydfci Dec 2, 2023
c2fbdc9
Added tilestitching code
sreekarreddydfci Dec 4, 2023
7c733b1
Update environment.yml
sreekarreddydfci Dec 4, 2023
2d183db
Create testdata folder for tilestitching data
sreekarreddydfci Dec 4, 2023
4413b66
Add large .tif file with Git LFS
sreekarreddydfci Dec 4, 2023
4e983de
≈Merge branch 'dev_graphAPI' of https://github.com/sreekarreddydfci/p…
sreekarreddydfci Dec 4, 2023
f590dd2
Remove readme file in tests
sreekarreddydfci Dec 4, 2023
393983c
Update tests-conda.yml
sreekarreddydfci Dec 4, 2023
e4af3e4
Added exclude marker to run tests
sreekarreddydfci Dec 4, 2023
e2bdf96
Merge branch 'dev_graphAPI' of https://github.com/sreekarreddydfci/pa…
sreekarreddydfci Dec 4, 2023
d4e7f3f
Edited a testcase
sreekarreddydfci Dec 4, 2023
9aeec4f
Commented testcases
sreekarreddydfci Dec 4, 2023
c01d6a7
Merge pull request #391 from sreekarreddydfci/dev_graphAPI
VarunUllanat Dec 4, 2023
474072a
Pasted the code from graphAPI
sreekarreddydfci Dec 5, 2023
2da44a3
Update environment.yml
sreekarreddydfci Dec 5, 2023
71dda3d
Added testcases
sreekarreddydfci Dec 5, 2023
2e7f4f4
Added test cases and environment file
sreekarreddydfci Dec 5, 2023
a6821b7
Updated env
sreekarreddydfci Dec 5, 2023
f04cb32
Updated env
sreekarreddydfci Dec 5, 2023
305f4e5
Merge pull request #393 from sreekarreddydfci/dev-tilestitching
sreekarreddydfci Dec 6, 2023
ab59e31
Make flake8 compliant
VarunUllanat Dec 6, 2023
b275a04
Removed tile stiching generated files
VarunUllanat Dec 6, 2023
10fdde7
Make flake8 compliant
VarunUllanat Dec 6, 2023
ee35408
Flake8 compliant
VarunUllanat Dec 6, 2023
c13ad5c
Merge branch 'dev_graph' into dev-tilestitching
VarunUllanat Dec 6, 2023
453e085
Merge pull request #394 from Dana-Farber-AIOS/dev-tilestitching
VarunUllanat Dec 6, 2023
711f735
Merge branch 'dev_graph' into dev-onnx
VarunUllanat Dec 6, 2023
44eca15
Merge pull request #397 from Dana-Farber-AIOS/dev-onnx
VarunUllanat Dec 6, 2023
6d2ea6c
Delete unwanted files
VarunUllanat Dec 6, 2023
9750fa0
Removed unwanted coverage files
VarunUllanat Dec 6, 2023
4e5240b
Refactored tile-stitching and testcases code
sreekarreddydfci Dec 12, 2023
d1ffff4
Merge pull request #400 from sreekarreddydfci/dev-tilestitching
VarunUllanat Dec 13, 2023
54a27af
adjusting doc strings and pushing docs files
jamesgwen Dec 13, 2023
aea51f5
adding more rst files
jamesgwen Dec 13, 2023
4457f2d
adjusting inference rst file
jamesgwen Dec 13, 2023
e090e50
adding more doc strings
jamesgwen Dec 13, 2023
6d3c0ac
adding more code to the inference page
jamesgwen Dec 14, 2023
b9359c0
Added docstrings
sreekarreddydfci Dec 15, 2023
87163f4
Updated docs
sreekarreddydfci Dec 15, 2023
a11db98
Update README.md
sreekarreddydfci Dec 15, 2023
44ede3f
Update README.md
sreekarreddydfci Dec 15, 2023
3cb2e31
adjusted doc strings
jamesgwen Dec 18, 2023
7ce212f
Update tests-conda.yml
sreekarreddydfci Dec 19, 2023
3c34f4d
Update tests-conda.yml
sreekarreddydfci Dec 19, 2023
b0bfe74
Added cuda instructions for environment creation
VarunUllanat Dec 20, 2023
112426b
Added torchvision install to github workflows
VarunUllanat Dec 20, 2023
4961630
fixing no h5manager error
jamesgwen Dec 20, 2023
d315f17
Update environment.yml
sreekarreddydfci Dec 21, 2023
3fe5214
Update environment.yml
sreekarreddydfci Dec 21, 2023
58fc092
Update environment.yml
sreekarreddydfci Dec 21, 2023
0788c8f
Update environment.yml
sreekarreddydfci Dec 21, 2023
5667623
Update environment.yml
sreekarreddydfci Dec 22, 2023
0765b75
Added Graph Components
sreekarreddydfci Jan 22, 2024
2b81ad3
Added remove functionality to TileStitcher
sreekarreddydfci Jan 22, 2024
dfeb4d0
Merge pull request #407 from sreekarreddydfci/dev-tilestitching
sreekarreddydfci Jan 22, 2024
7e7b466
Merge pull request #408 from Dana-Farber-AIOS/dev-tilestitching
VarunUllanat Jan 25, 2024
fe1d17e
Bug fixes
sreekarreddydfci Jan 26, 2024
39fd2a8
Make flake8 compliant
VarunUllanat Jan 30, 2024
1304351
Added test_cases and bug fixes.
sreekarreddydfci Jan 30, 2024
7ef56e7
precommit fixes
sreekarreddydfci Jan 30, 2024
e904a87
precommit fixes
sreekarreddydfci Jan 30, 2024
a711b64
precommit fixes
sreekarreddydfci Jan 30, 2024
68e0f0d
Merge pull request #410 from sreekarreddydfci/dev-tilestitching
sreekarreddydfci Jan 30, 2024
04676b0
Update readme
sreekarreddydfci Jan 30, 2024
caa4bd8
Update Readme
sreekarreddydfci Jan 30, 2024
2433814
Update tests-conda.yml
sreekarreddydfci Jan 30, 2024
279f04b
Merge pull request #412 from sreekarreddydfci/dev-tilestitching
sreekarreddydfci Jan 31, 2024
a16f27d
Merge branch 'dev_graph' into dev-tilestitching
sreekarreddydfci Jan 31, 2024
8830f34
Merge pull request #411 from Dana-Farber-AIOS/dev-tilestitching
VarunUllanat Jan 31, 2024
32cae0e
Cleaned up code
VarunUllanat Jan 31, 2024
1bd248f
Make black compliant again
VarunUllanat Jan 31, 2024
a576b9c
Make flake8 compliant
VarunUllanat Jan 31, 2024
f908434
Merge updates from upstream/dev_graph
sreekarreddydfci Jan 31, 2024
7c6f979
Make pre-commit compliant
VarunUllanat Feb 1, 2024
0e7cace
Added test cases
sreekarreddydfci Feb 1, 2024
a925964
Revert "Added test cases"
sreekarreddydfci Feb 1, 2024
d849410
Added test cases
sreekarreddydfci Feb 1, 2024
48a4979
Added deepfocus tests
sreekarreddydfci Feb 1, 2024
663dcb9
Merge pull request #414 from sreekarreddydfci/dev-tilestitching
sreekarreddydfci Feb 1, 2024
7a60a3e
Delete README-Copy1.md
sreekarreddydfci Feb 1, 2024
b6c34ea
Delete dummy_stitched_image_path.ome.tif
sreekarreddydfci Feb 1, 2024
906f740
Merge pull request #415 from Dana-Farber-AIOS/dev-tilestitching
VarunUllanat Feb 1, 2024
ba78bcb
Updated environment files and removed deepcell
VarunUllanat Feb 6, 2024
1e0d87c
Updated environment files to contain numpy versions
VarunUllanat Feb 6, 2024
a25f2b6
Make black compliant without pre-commit
VarunUllanat Feb 6, 2024
638e83e
Update precommit-hooks.yaml to python 3.10
VarunUllanat Feb 6, 2024
b8f50de
Update precommit-hooks.yaml
VarunUllanat Feb 6, 2024
e31c430
Update precommit-hooks.yaml
VarunUllanat Feb 6, 2024
1615801
Update precommit-hooks.yaml
VarunUllanat Feb 6, 2024
d4edba2
ensure pre-commit compliant
VarunUllanat Feb 6, 2024
2e836a0
Merge branch 'dev_graph' of https://github.com/Dana-Farber-AIOS/pathm…
VarunUllanat Feb 6, 2024
75ec522
changed local pre-commit
VarunUllanat Feb 6, 2024
1282cef
Update precommit-hooks.yaml
VarunUllanat Feb 6, 2024
d716dc9
Make pre-commit compliant
VarunUllanat Feb 6, 2024
c5b8cb8
Update tests-conda.yml
VarunUllanat Feb 6, 2024
50df092
Update tests-conda.yml
VarunUllanat Feb 6, 2024
45f1be6
revert back to old environment
VarunUllanat Feb 6, 2024
a6a2c5a
Merge branch 'dev_graph' of https://github.com/Dana-Farber-AIOS/pathm…
VarunUllanat Feb 6, 2024
309d489
Update tests-conda.yml to remove Deepcell install
VarunUllanat Feb 6, 2024
7c299d1
Update tests-conda.yml to free space
VarunUllanat Feb 6, 2024
cf05cec
Added testcases
sreekarreddydfci Feb 7, 2024
123a0e6
Merge pull request #417 from sreekarreddydfci/dev-tilestitching
sreekarreddydfci Feb 7, 2024
5ebc325
Merge remote-tracking branch 'upstream/dev_graph' into dev-tilestitching
sreekarreddydfci Feb 7, 2024
33f02e7
Merge pull request #418 from Dana-Farber-AIOS/dev-tilestitching
VarunUllanat Feb 7, 2024
ce0c253
Added new two-hop computation
VarunUllanat Feb 8, 2024
2650d5a
Merge branch 'dev_graph' of https://github.com/Dana-Farber-AIOS/pathm…
VarunUllanat Feb 8, 2024
1d36395
Added python version in environment file
VarunUllanat Feb 8, 2024
20757a0
Removed deepcell installation
VarunUllanat Feb 8, 2024
7a7e092
Updated graph utils and clean
VarunUllanat Feb 9, 2024
9350557
Update test_inference.py
sreekarreddydfci Feb 15, 2024
ac2e90f
Update test_inference.py
sreekarreddydfci Feb 15, 2024
5a64b73
Updated stain normalization class
VarunUllanat Feb 21, 2024
9d5885b
Updated stain normalization class
VarunUllanat Feb 21, 2024
c12ca8a
`Merge branch 'dev_graph' of https://github.com/Dana-Farber-AIOS/path…
VarunUllanat Feb 21, 2024
b1f37f4
Updated graph utils tests
VarunUllanat Feb 21, 2024
0d1ad73
Updated example notebooks
sreekarreddydfci Feb 22, 2024
f213b02
Merge remote-tracking branch 'upstream/dev_graph' into dev-tilestitching
sreekarreddydfci Feb 22, 2024
85ce24d
Updated graphs notebook
sreekarreddydfci Feb 22, 2024
044b9bb
Added documentation for graph API
VarunUllanat Feb 22, 2024
09fae9b
Merge pull request #419 from sreekarreddydfci/dev-tilestitching
sreekarreddydfci Feb 22, 2024
9a40d2d
Merge pull request #420 from Dana-Farber-AIOS/dev-tilestitching
VarunUllanat Feb 22, 2024
5a4a493
Updated environment file, added instructions and references
VarunUllanat Feb 23, 2024
90288b4
Cleaned up examples and setup.py
VarunUllanat Feb 23, 2024
7c884fd
Updated notebooks and docs
VarunUllanat Feb 26, 2024
8ad8149
Updated notebooks and docs
VarunUllanat Feb 26, 2024
5cde633
Added JCO example
VarunUllanat Feb 26, 2024
354a1b9
Added JCO example
VarunUllanat Feb 26, 2024
c402649
Reformatted README installation instructions
VarunUllanat Feb 27, 2024
0e5a0c0
Update README.md
VarunUllanat Feb 27, 2024
f72c00c
Update README.md
VarunUllanat Feb 28, 2024
52582b2
Update README.md
VarunUllanat Feb 28, 2024
2b7ff01
Update setup.py to add torch cuda installation
VarunUllanat Feb 28, 2024
0ebb8d7
Update README.md
VarunUllanat Feb 28, 2024
6ce5d82
Added comments for stain normalization
VarunUllanat Feb 28, 2024
f017775
Added our implementation of mesmer model
VarunUllanat Mar 1, 2024
4b88260
Adding note on where mesmer output is saved to doc string
jamesgwen Mar 4, 2024
f803c46
Adjusting the header in mesmer utils file to contain citation
jamesgwen Mar 4, 2024
e96a80f
Added betters tests for segmentmif
VarunUllanat Mar 4, 2024
a3b998c
Added no coverage comments
VarunUllanat Mar 4, 2024
4306f80
Added environment for mac, updated instructions and docs
VarunUllanat Mar 5, 2024
eb80e05
Minor edits in README
VarunUllanat Mar 5, 2024
b9cd267
Removed deepcell in test environment
VarunUllanat Mar 5, 2024
915aa2c
Create test_windows.yml
VarunUllanat Mar 6, 2024
0cb2621
adding mesmer to the rst documentation
jamesgwen Mar 6, 2024
79e543d
adjusting doc strings for the memser class
jamesgwen Mar 6, 2024
39828b5
adding new inference notebook
jamesgwen Mar 6, 2024
a417ea2
Merge branch 'Dana-Farber-AIOS:dev_graph' into dev_graph
VarunUllanat Mar 6, 2024
1f84e58
Create tests-macos.yml
VarunUllanat Mar 6, 2024
cc00b24
Update tests-macos.yml
VarunUllanat Mar 6, 2024
a01d254
Added github workflow files
VarunUllanat Mar 6, 2024
7dcfd94
Updated windows tests
VarunUllanat Mar 6, 2024
d13b032
Update tests-windows.yml
VarunUllanat Mar 6, 2024
95d6f08
Update tests-windows.yml
VarunUllanat Mar 6, 2024
1e3af35
Create env-py310.yml
VarunUllanat Mar 6, 2024
6aafd0c
Create env-py38.yml
VarunUllanat Mar 6, 2024
e9a4f3c
Update env-py310.yml
VarunUllanat Mar 6, 2024
df667a7
Create env-py39.yml
VarunUllanat Mar 6, 2024
ded1af9
Delete .github/ci-environments/windows-env.yml
VarunUllanat Mar 6, 2024
27ad6ce
specified utf-8 encoding in setup.py
VarunUllanat Mar 6, 2024
d0a95fd
fixed undefined version in setup.py
VarunUllanat Mar 6, 2024
912d2be
Added macos tests
VarunUllanat Mar 6, 2024
043c402
Added skip statements in tests for windows and macos compatibility
VarunUllanat Mar 6, 2024
bf42d64
Added skip statements in tests for windows and macos compatibility
VarunUllanat Mar 6, 2024
b1fdcb2
Updated tests to remove deepcell dependency
VarunUllanat Mar 7, 2024
c18f68d
Fixed small bug in mesmer import
VarunUllanat Mar 7, 2024
7a25d2c
Added windows bug fixes and tests skipping dask stuff
VarunUllanat Mar 7, 2024
22f2a04
Update tests-macos.yml to be verbose
VarunUllanat Mar 7, 2024
028f775
Fixed bugs in windows testing
VarunUllanat Mar 7, 2024
05b591e
Merge branch 'dev_graph' of https://github.com/VarunUllanat/pathml in…
VarunUllanat Mar 7, 2024
9374042
Small change in tile size for segmentmif tests
VarunUllanat Mar 7, 2024
13967ac
Added path permission fixes for windows
VarunUllanat Mar 7, 2024
9839004
removed small bugs in macos and windows tests
VarunUllanat Mar 7, 2024
a9e0be6
Update tests-windows.yml to remove run on error
VarunUllanat Mar 7, 2024
2bdd98b
Update tests-macos.yml to remove verbosity
VarunUllanat Mar 7, 2024
e467f3a
fixed windows dask issue in test_slide_data.py
VarunUllanat Mar 8, 2024
48abe39
Merge branch 'dev_graph' of https://github.com/VarunUllanat/pathml in…
VarunUllanat Mar 8, 2024
bf805f5
Update tests-windows.yml to use environment.yml
VarunUllanat Mar 8, 2024
8a9b433
Merge pull request #426 from VarunUllanat/dev_graph
VarunUllanat Mar 8, 2024
3a85513
Update workflow dispatch in tests-macos.yml
VarunUllanat Mar 8, 2024
66b2445
Update workflow dispatch in tests-windows.yml
VarunUllanat Mar 8, 2024
ed25077
Removed unused environment files in github workflows
VarunUllanat Mar 8, 2024
23336e4
make pre-commit compliant
VarunUllanat Mar 8, 2024
f28d35f
make pre-commit compliant in conftest.py
VarunUllanat Mar 8, 2024
51e463c
Updated dockerfile
Mar 11, 2024
6377eaa
Update _version.py to 3.0.0
VarunUllanat Mar 11, 2024
11c79e0
Update test_inference.py
VarunUllanat Mar 11, 2024
9031407
Update and rename tests-conda.yml to tests-linux.yml
VarunUllanat Mar 11, 2024
8d13d22
Added more references
VarunUllanat Mar 13, 2024
cfe6d5b
Updated read-the-docs
VarunUllanat Mar 14, 2024
b9e4e68
Fixed small typos in example notebooks
VarunUllanat Mar 18, 2024
ce28e07
Updated examples notebooks with references
VarunUllanat Mar 18, 2024
62b0e7e
Updated example notebooks and documentation order
VarunUllanat Mar 20, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
tests/testdata/tilestitching_testdata/*.tif filter=lfs diff=lfs merge=lfs -text
21 changes: 11 additions & 10 deletions .github/workflows/precommit-hooks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,16 @@ name: pre-commit-hooks
on: [pull_request]

jobs:
build:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up Python 3.8
uses: actions/setup-python@v1
with:
python-version: 3.8
- name: Linting
run: |
pip install pre-commit
pre-commit run --all-files
- uses: actions/checkout@v3
- uses: psf/black@stable
pre-commit:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v3
- uses: pre-commit/[email protected]
with:
extra_args: flake8 --all-files
3 changes: 2 additions & 1 deletion .github/workflows/publish-to-docker-hub.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,10 @@ jobs:
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build and push
id: docker_build
uses: docker/build-push-action@v2.7.0
uses: docker/build-push-action@v4
with:
context: .
platforms: linux/amd64,linux/arm64
push: true
tags: |
pathml/pathml:latest
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/publish-to-pypi.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
name: Publish PathML distribution to PyPI and TestPyPI

on:
workflow_dispatch:
release:
types: [published]

jobs:
build-n-publish:
name: Build and publish PathML distribution to PyPI and TestPyPI
runs-on: ubuntu-18.04
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- name: Set up Python 3.9
Expand Down
79 changes: 0 additions & 79 deletions .github/workflows/tests-conda.yml

This file was deleted.

165 changes: 165 additions & 0 deletions .github/workflows/tests-linux.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,165 @@
name: Tests linux

on:
workflow_dispatch:
pull_request:
branches:
- dev
- master
push:
branches:
- dev
- master

jobs:
build-linux:
runs-on: ubuntu-latest
strategy:
max-parallel: 5
matrix:
python-version: ["3.8", "3.9", "3.10"]
timeout-minutes: 60 # add a timeout

steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Display Python version
run: python -c "import sys; print(sys.version)"
- name: Install dependencies
shell: bash -l {0}
run: |
sudo apt-get update
sudo apt-get install openslide-tools
sudo apt-get install pandoc
- name: Setup Miniconda
uses: conda-incubator/setup-miniconda@v2
with:
auto-activate-base: false
activate-environment: pathml
environment-file: requirements/environment_test.yml
# mamba-version: "*"
miniforge-version: latest
use-mamba: true
channels: conda-forge
python-version: ${{ matrix.python-version }}
- name: Debugging
run: |
echo "Printing the environment.yml file..."
cat requirements/environment_test.yml
echo "Checking the status of mamba..."
mamba --version
echo "Checking the available disk space..."
df -h

- name: Install dependencies with mamba
shell: bash -l {0}
run: mamba env update --file requirements/environment_test.yml --name pathml
- name: Conda info
shell: bash -l {0}
run: |
conda info
conda list

- name: Set default Temurin JDK 17
run: |
sudo update-java-alternatives --set temurin-17-jdk-amd64 || true
java -version

- name: Install PathML
shell: bash -l {0}
run: pip install -e .

- name: Install torchvision
shell: bash -l {0}
run: pip install torchvision==0.14.1

- name: disk usage
shell: bash -l {0}
run: |
sudo df -h
sudo du -h

- name: free disk space
run: |
sudo swapoff -a
sudo rm -f /swapfile
sudo apt clean
docker rmi $(docker image ls -aq)
sudo df -h
sudo du -h

# - name: Check Coverage Command
# run: |
# which coverage
# coverage --version

# - name: Test with pytest for tile_stitcher
# run: |
# java -version
# python -m pytest tests/preprocessing_tests/test_tilestitcher.py

# - name: Test with pytest and generate coverage report
# shell: bash -l {0}
# run: |
# coverage run -m pytest -m "not slow and not exclude"
# coverage xml
# - name: Upload coverage to Codecov
# uses: codecov/codecov-action@v2
# with:
# token: ${{ secrets.CODECOV_TOKEN }}
# env_vars: OS,PYTHON
# fail_ci_if_error: true
# files: ./coverage.xml
# name: codecov-umbrella
# verbose: true

- name: Test other modules with pytest and generate coverage
shell: bash -l {0}
run: |
COVERAGE_FILE=.coverage_others coverage run -m pytest -m "not slow and not exclude"

- name: Test tile_stitcher with pytest and generate coverage
shell: bash -l {0}
run: |
COVERAGE_FILE=.coverage_tilestitcher coverage run -m pytest tests/preprocessing_tests/test_tilestitcher.py

- name: List Files in Directory
shell: bash -l {0}
run: |
ls -la

- name: Combine Coverage Data
shell: bash -l {0}
run: |
coverage combine .coverage_tilestitcher .coverage_others

- name: Generate Combined Coverage Report
shell: bash -l {0}
run: |
coverage xml -o combined_coverage.xml

# - name: Combine coverage data
# shell: bash -l {0}
# run: |
# coverage combine coverage_tilestitcher.xml coverage_others.xml
# coverage xml -o coverage_combined.xml

- name: Upload combined coverage to Codecov
uses: codecov/codecov-action@v2
with:
token: ${{ secrets.CODECOV_TOKEN }}
env_vars: OS,PYTHON
fail_ci_if_error: true
files: ./combined_coverage.xml
name: codecov-umbrella
verbose: true

- name: Compile docs
shell: bash -l {0}
run: |
cd docs
pip install -r readthedocs-requirements.txt
make html
71 changes: 71 additions & 0 deletions .github/workflows/tests-macos.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
name: Tests MacOS

on:
workflow_dispatch:
pull_request:
branches:
- dev
- master
push:
branches:
- dev
- master

jobs:
build:
name: Build (${{ matrix.os }}, Python ${{ matrix.python-version }})
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [macos-latest]
python-version: ["3.8"]

steps:
- uses: actions/checkout@v2

- name: Install openslide
shell: bash -l {0}
run: brew install openslide

- name: Setup Miniconda
uses: conda-incubator/setup-miniconda@v3
with:
auto-update-conda: true
miniforge-version: latest
use-mamba: true
python-version: ${{ matrix.python-version }}
activate-environment: pathml
environment-file: requirements/environment_mac.yml
channels: conda-forge

- name: Conda info
shell: bash -l {0}
run: conda info

- name: Conda Version
shell: bash -l {0}
run: conda --version

- name: Set default Temurin JDK 17
run: |
sudo update-java-alternatives --set temurin-17-jdk-amd64 || true
java -version

- name: Install PathML
shell: bash -l {0}
run: pip install -e .

- name: Install torchvision
shell: bash -l {0}
run: pip install torchvision==0.14.1

- name: Test other modules with pytest and generate coverage
shell: bash -l {0}
run: |
COVERAGE_FILE=.coverage_others coverage run -m pytest -m "not slow and not exclude"

- name: Test tile_stitcher with pytest and generate coverage
shell: bash -l {0}
run: |
COVERAGE_FILE=.coverage_tilestitcher coverage run -m pytest tests/preprocessing_tests/test_tilestitcher.py
Loading
Loading