Skip to content

Commit 64d4243

Browse files
authored
Merge pull request #217 from jhlegarreta/sty/misc-cleanup
STY: Miscellaneous cleanup
2 parents 19af931 + cbd6299 commit 64d4243

File tree

2 files changed

+75
-87
lines changed

2 files changed

+75
-87
lines changed

.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,14 @@ jobs:
5151
uses: actions/cache@v4
5252
id: test-data
5353
with:
54-
path: /home/runner/nifreeze-tests/
54+
path: ${{ env.TEST_DATA_HOME }}
5555
key: data-v2-${{ steps.test-head.outputs.SHA }}
5656
lookup-only: true
5757
- name: Create data-v2-${{ steps.test-head.outputs.SHA }}
5858
uses: actions/cache@v4
5959
if: steps.test-data.outputs.cache-hit != 'true'
6060
with:
61-
path: /home/runner/nifreeze-tests/
61+
path: ${{ env.TEST_DATA_HOME }}
6262
key: data-v2-${{ steps.test-head.outputs.SHA }}
6363
restore-keys: |
6464
data-v2
@@ -123,7 +123,7 @@ jobs:
123123
antsRegistration --version
124124
- uses: actions/cache/restore@v4
125125
with:
126-
path: /home/runner/nifreeze-tests/
126+
path: ${{ env.TEST_DATA_HOME }}
127127
key: data-v2-${{ needs.cache-test-data.outputs.SHA }}
128128
- name: Install TeX Live
129129
run: |

pyproject.toml

Lines changed: 72 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,29 @@ description = "A flexible framework for volume-to-volume artifact estimation and
99
readme = "README.rst"
1010
authors = [{name = "The NiPreps Developers", email = "[email protected]"}]
1111
classifiers = [
12-
"Development Status :: 3 - Alpha",
13-
"Intended Audience :: Science/Research",
14-
"Topic :: Scientific/Engineering :: Image Recognition",
15-
"License :: OSI Approved :: Apache Software License",
16-
"Programming Language :: Python :: 3.10",
17-
"Programming Language :: Python :: 3.11",
18-
"Programming Language :: Python :: 3.12",
12+
"Development Status :: 3 - Alpha",
13+
"Intended Audience :: Science/Research",
14+
"Topic :: Scientific/Engineering :: Image Recognition",
15+
"License :: OSI Approved :: Apache Software License",
16+
"Programming Language :: Python :: 3.10",
17+
"Programming Language :: Python :: 3.11",
18+
"Programming Language :: Python :: 3.12",
1919
]
2020
license = "Apache-2.0"
2121
requires-python = ">=3.10"
2222
dependencies = [
23-
"attrs",
24-
"dipy>=1.5.0",
25-
"joblib",
26-
"nipype>= 1.5.1,<2.0",
27-
"nitransforms>=22.0.0,<24",
28-
"nireports",
29-
"numpy>=1.21.3",
30-
"nest-asyncio>=1.5.1",
31-
"scikit-image>=0.15.0",
32-
"scikit_learn>=1.3.0",
33-
"scipy>=1.8.0",
34-
"typing_extensions >=4.12",
23+
"attrs",
24+
"dipy>=1.5.0",
25+
"joblib",
26+
"nipype>= 1.5.1,<2.0",
27+
"nitransforms>=22.0.0,<24",
28+
"nireports",
29+
"numpy>=1.21.3",
30+
"nest-asyncio>=1.5.1",
31+
"scikit-image>=0.15.0",
32+
"scikit_learn>=1.3.0",
33+
"scipy>=1.8.0",
34+
"typing_extensions >=4.12",
3535
]
3636
dynamic = ["version"]
3737

@@ -42,41 +42,37 @@ NiPreps = "https://www.nipreps.org/"
4242

4343
[project.optional-dependencies]
4444
doc = [
45-
"attrs >= 20.1.0",
46-
"furo >= 2024.01.29",
47-
"matplotlib >= 2.2.0",
48-
"nbsphinx",
49-
"packaging",
50-
"pydot >= 1.2.3",
51-
"pydotplus",
52-
"sphinx >= 4.5, <8",
53-
"sphinx-argparse",
54-
"sphinx_rtd_theme",
55-
"sphinxcontrib-apidoc",
56-
"sphinxcontrib-napoleon",
57-
"sphinxcontrib-versioning",
58-
"sphinx-argparse",
59-
"sphinxcontrib-bibtex",
45+
"attrs >= 20.1.0",
46+
"furo >= 2024.01.29",
47+
"matplotlib >= 2.2.0",
48+
"nbsphinx",
49+
"packaging",
50+
"pydot >= 1.2.3",
51+
"pydotplus",
52+
"sphinx >= 4.5, <8",
53+
"sphinx-argparse",
54+
"sphinx_rtd_theme",
55+
"sphinxcontrib-apidoc",
56+
"sphinxcontrib-napoleon",
57+
"sphinxcontrib-versioning",
58+
"sphinx-argparse",
59+
"sphinxcontrib-bibtex",
6060
]
61-
6261
dev = [
63-
"ruff",
64-
"pre-commit",
65-
"pre-commit-hooks",
62+
"ruff",
63+
"pre-commit",
64+
"pre-commit-hooks",
6665
]
67-
6866
plotting = ["nilearn"]
69-
7067
resmon = ["psutil >=5.4"]
71-
7268
test = [
73-
"coverage",
74-
"ipykernel",
75-
"mriqc-learn",
76-
"pytest >= 4.4",
77-
"pytest-cov",
78-
"pytest-env",
79-
"pytest-xdist >= 1.28"
69+
"coverage",
70+
"ipykernel",
71+
"mriqc-learn",
72+
"pytest >= 4.4",
73+
"pytest-cov",
74+
"pytest-env",
75+
"pytest-xdist >= 1.28"
8076
]
8177
types = [
8278
"pandas-stubs",
@@ -87,26 +83,23 @@ types = [
8783
"types-tqdm",
8884
"pytest",
8985
]
90-
9186
notebooks = [
92-
"jupyter",
93-
"nbclient",
94-
"nbmake",
95-
"mriqc_learn",
96-
"nipreps-synthstrip",
87+
"jupyter",
88+
"nbclient",
89+
"nbmake",
90+
"mriqc_learn",
91+
"nipreps-synthstrip",
9792
]
98-
9993
antsopt = [
100-
"ConfigSpace",
101-
"nipreps",
102-
"scikit-image",
103-
"smac",
94+
"ConfigSpace",
95+
"nipreps",
96+
"scikit-image",
97+
"smac",
10498
]
105-
10699
benchmark = [
107-
"asv",
108-
"pyperf",
109-
"virtualenv==20.30",
100+
"asv",
101+
"pyperf",
102+
"virtualenv==20.30",
110103
]
111104

112105
# Aliases
@@ -130,10 +123,9 @@ exclude = [".git_archival.txt"] # No longer needed in sdist
130123
[tool.hatch.build.targets.wheel]
131124
packages = ["src/nifreeze"]
132125
# exclude = [
133-
# "nifreeze/tests/data", # Large test data directory
126+
# "nifreeze/tests/data", # Large test data directory
134127
# ]
135128

136-
137129
[tool.hatch.version]
138130
validate-bump = true
139131
source = "vcs"
@@ -142,7 +134,6 @@ source = "vcs"
142134
version_scheme = "nipreps-calver"
143135
local_scheme = "no-local-version"
144136

145-
146137
[tool.hatch.build.hooks.vcs]
147138
version-file = "src/nifreeze/_version.py"
148139

@@ -180,7 +171,6 @@ exclude = [
180171
"build",
181172
"dist",
182173
]
183-
extend-exclude = ["docs/notebooks/PET_example.ipynb"]
184174

185175
[tool.ruff.lint]
186176
select = [
@@ -221,10 +211,10 @@ addopts = "-v --doctest-modules"
221211
doctest_optionflags = "ALLOW_UNICODE NORMALIZE_WHITESPACE ELLIPSIS"
222212
env = "PYTHONHASHSEED=0"
223213
markers = [
224-
"random_gtab_data: Custom marker for random gtab data tests",
225-
"random_dwi_data: Custom marker for random dwi data tests",
226-
"random_uniform_ndim_data: Custom marker for random multi-dimensional data tests",
227-
"random_uniform_spatial_data: Custom marker for random spatial data tests",
214+
"random_gtab_data: Custom marker for random gtab data tests",
215+
"random_dwi_data: Custom marker for random dwi data tests",
216+
"random_uniform_ndim_data: Custom marker for random multi-dimensional data tests",
217+
"random_uniform_spatial_data: Custom marker for random spatial data tests",
228218
]
229219
filterwarnings = [
230220
"ignore::DeprecationWarning",
@@ -234,31 +224,29 @@ filterwarnings = [
234224
"ignore:The optimal value found for dimension.*:sklearn.exceptions.ConvergenceWarning",
235225
]
236226

237-
238227
[tool.coverage.run]
239228
branch = true
240229
parallel = true
241-
concurrency = ['multiprocessing']
230+
concurrency = ["multiprocessing"]
242231
omit = [
243-
'*/tests/*',
244-
'*/testing/*',
245-
'*/viz/*',
246-
'*/__init__.py',
247-
'*/conftest.py',
248-
'src/nifreeze/_version.py'
232+
"*/tests/*",
233+
"*/testing/*",
234+
"*/viz/*",
235+
"*/__init__.py",
236+
"*/conftest.py",
237+
"src/nifreeze/_version.py"
249238
]
250239

251240
[tool.coverage.report]
252241
# Regexes for lines to exclude from consideration
253242
exclude_lines = [
254-
'raise NotImplementedError',
255-
'warnings\.warn',
243+
"raise NotImplementedError",
244+
"warnings\\.warn",
256245
]
257246

258247
[tool.codespell]
259248
# nd - import scipy.ndimage as nd
260249
# mapp, reson -- Mapp. and Reson. abbreviations in citation
261-
ignore-words-list = 'nd,mapp,reson'
250+
ignore-words-list = "nd,mapp,reson"
262251
skip = """
263-
./.git,*.pdf,*.svg,*.min.js,*.ipynb,ORIGINAL_LICENSE,\
264-
./docs/source/_static/example_anatreport.html"""
252+
./.git,*.pdf,*.svg,*.min.js,*.ipynb"""

0 commit comments

Comments
 (0)