Skip to content

Commit e5f0bab

Browse files
authored
Merge branch 'master' into enh-codespell
2 parents c8760ae + 5d8a23c commit e5f0bab

File tree

3 files changed

+14
-3
lines changed

3 files changed

+14
-3
lines changed

.circleci/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@ jobs:
2020
2121
- restore_cache:
2222
keys:
23-
- deps-v10-{{ checksum "/tmp/src/templateflow/requirements.txt"}}-{{ epoch }}
24-
- deps-v10-{{ checksum "/tmp/src/templateflow/requirements.txt"}}-
23+
- deps-v10-{{ checksum "/tmp/src/templateflow/dev-requirements.txt"}}-{{ epoch }}
24+
- deps-v10-{{ checksum "/tmp/src/templateflow/dev-requirements.txt"}}-
2525
- deps-v10-
2626
- run:
2727
name: Prepare environment
2828
command: |
2929
python -m venv /tmp/venv
3030
source /tmp/venv/bin/activate
3131
pip install -U pip
32-
pip install -r /tmp/src/templateflow/requirements.txt
32+
pip install -r /tmp/src/templateflow/dev-requirements.txt
3333
pip install datalad
3434
pip install -U build hatch hatchling nipreps-versions build twine codecov
3535

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ _version.py
44
# circleci hash checking
55
requirements.txt
66
min-requirements.txt
7+
dev-requirements.txt
78

89
# Byte-compiled / optimized / DLL files
910
__pycache__/

.maint/update_requirements.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,18 @@
1313
pyproject = repo_root / 'pyproject.toml'
1414
reqs = repo_root / 'requirements.txt'
1515
min_reqs = repo_root / 'min-requirements.txt'
16+
reqs_dev = repo_root / 'dev-requirements.txt'
1617

1718
requirements = [
1819
Requirement(req)
1920
for req in loads(pyproject.read_text())['project']['dependencies']
2021
]
2122

23+
requirements_dev = [
24+
Requirement(req)
25+
for req in loads(pyproject.read_text())['project']['optional-dependencies']['test']
26+
]
27+
2228
script_name = Path(__file__).relative_to(repo_root)
2329

2430

@@ -40,6 +46,10 @@ def to_min(req):
4046
lines[1:-1] = [str(req) for req in requirements]
4147
reqs.write_text('\n'.join(lines))
4248

49+
# Write dev-requirements
50+
lines[1:-1] = [str(req) for req in (requirements + requirements_dev)]
51+
reqs_dev.write_text('\n'.join(lines))
52+
4353
# Write minimum requirements
4454
lines[1:-1] = [str(to_min(req)) for req in requirements]
4555
min_reqs.write_text('\n'.join(lines))

0 commit comments

Comments
 (0)