Skip to content

Commit 7825f1e

Browse files
committed
Merge branch 'devel' into pr/108
2 parents ae85ea8 + c276511 commit 7825f1e

File tree

14 files changed

+538
-180
lines changed

14 files changed

+538
-180
lines changed

β€Ž.vscode/settings.jsonβ€Ž

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,38 @@
1010
"tables": false
1111
}
1212
},
13+
"cSpell.words": [
14+
"acitt",
15+
"bdvp",
16+
"bigstitcher",
17+
"biop",
18+
"imageplus",
19+
"imglib",
20+
"interestpoint",
21+
"intermodes",
22+
"javax",
23+
"Kheops",
24+
"micrometa",
25+
"multiresolution",
26+
"otsu",
27+
"pathtools",
28+
"Prefs",
29+
"PTBIOP",
30+
"PYENV",
31+
"pylint",
32+
"ransac",
33+
"renyi",
34+
"repartitions",
35+
"RETVAL",
36+
"scijava",
37+
"shanbhag",
38+
"sjlogging",
39+
"spimdata",
40+
"strtools",
41+
"subfolders",
42+
"subsampling",
43+
"trackmate",
44+
"virtualenv",
45+
"virtualfish"
46+
],
1347
}

β€Žpoetry.lockβ€Ž

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žpoetry.lock.mdβ€Ž

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žpyproject.tomlβ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ version = "0.0.0"
2020
# - or: python = ">=3.10"
2121

2222
[tool.poetry.dependencies]
23-
imcf-fiji-mocks = ">=0.10.0"
23+
imcf-fiji-mocks = ">=0.13.0"
2424
python = ">=2.7"
2525
python-micrometa = "^15.2.2"
2626
sjlogging = ">=0.5.2"
@@ -53,4 +53,4 @@ ignore = [
5353
]
5454

5555
[tool.ruff.lint.pydocstyle]
56-
convention = "numpy"
56+
convention = "numpy"

0 commit comments

Comments
Β (0)