Skip to content

Commit c2b5882

Browse files
committed
copier update
1 parent 06d75da commit c2b5882

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

.copier-answers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
2-
_commit: ee9a09a
2+
_commit: 713c40f
33
_src_path: gh:scipp/copier_template
44
description: Reflectometry data reduction for the European Spallation Source
55
max_python: '3.12'

.github/workflows/ci.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,13 @@ jobs:
2727
- uses: actions/setup-python@v4
2828
with:
2929
python-version-file: '.github/workflows/python-version-ci'
30-
- run: python -m pip install --upgrade pip
31-
- run: python -m pip install -r requirements/ci.txt
32-
- run: tox -e static
33-
- uses: stefanzweifel/git-auto-commit-action@v5
30+
- uses: pre-commit/[email protected]
3431
with:
35-
commit_message: Apply automatic formatting
32+
extra_args: --all-files
33+
- uses: pre-commit-ci/[email protected]
34+
if: always()
35+
with:
36+
msg: Apply automatic formatting
3637

3738
tests:
3839
name: Tests

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,4 @@ docs/generated/
3737
*.raw
3838
*.cif
3939
*.rcif
40+
*.ort

docs/conf.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
'sphinx.ext.intersphinx',
2424
'sphinx.ext.mathjax',
2525
'sphinx.ext.napoleon',
26+
'sphinx.ext.viewcode',
2627
'sphinx_autodoc_typehints',
2728
'sphinx_copybutton',
2829
'sphinx_design',

requirements/base.in

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
# Temporary until questionary (dep of copier) updates
2-
# See https://github.com/tmbo/questionary/blob/2df265534f3eb77aafcf70902e53e80beb1793e0/pyproject.toml#L36C43-L36C110
3-
prompt-toolkit==3.0.36
4-
# Temporary pinned until prompt-tookit conflict is resolved.
5-
ipython==8.9.0
1+
# Anything above "--- END OF CUSTOM SECTION ---"
2+
# will not be touched by ``make_base.py``
63
# --- END OF CUSTOM SECTION ---
74
# The following was generated by 'tox -e deps', DO NOT EDIT MANUALLY!
85
dask

requirements/make_base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def write_dependencies(dependency_name: str, dependencies: List[str]) -> None:
4343
with open("../pyproject.toml", "rb") as toml_file:
4444
pyproject = tomli.load(toml_file)
4545
dependencies = pyproject["project"].get("dependencies")
46-
if not dependencies:
46+
if dependencies is None:
4747
raise RuntimeError("No dependencies found in pyproject.toml")
4848
dependencies = [dep.strip().strip('"') for dep in dependencies]
4949

0 commit comments

Comments
 (0)