Skip to content

Commit

Permalink
Merge branch 'main' into comap-v
Browse files Browse the repository at this point in the history
  • Loading branch information
redeboer committed Jan 12, 2024
2 parents cfed909 + 61b4590 commit d4f4acd
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 5 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
.ipynb_checkpoints/
.tox/
condaenv.*.requirements.txt
node_modules/
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ repos:
- id: check-hooks-apply
- id: check-useless-excludes

- repo: https://github.com/ComPWA/repo-maintenance
rev: 0.1.13a6
- repo: https://github.com/ComPWA/policy
rev: 0.2.0
hooks:
- id: check-dev-files
args:
Expand Down
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
},
"[python]": {
"editor.codeActionsOnSave": {
"source.organizeImports": true
"source.organizeImports": "explicit"
}
},
"[yaml]": {
Expand Down
4 changes: 3 additions & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ dependencies:
- pip>=19
- graphviz
- pip:
- -e .[dev]
- >-
-c requirements.txt
-r requirements.in
variables:
PRETTIER_LEGACY_CLI: "1"
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ terminado==0.18.0
tinycss2==1.2.1
tomli==2.0.1
tornado==6.4
tox==4.11.4
tox==4.12.0
traitlets==5.14.1
types-python-dateutil==2.8.19.20240106
typing-extensions==4.9.0
Expand Down

0 comments on commit d4f4acd

Please sign in to comment.