Skip to content

Commit

Permalink
Merge branch 'main' into feature/add-upfdata-input
Browse files Browse the repository at this point in the history
  • Loading branch information
yakutovicha authored Apr 2, 2024
2 parents 9310628 + 400fa3d commit b5c642b
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ repos:
exclude: *exclude_pre_commit_hooks

- repo: https://github.com/psf/black
rev: 23.12.1
rev: 24.3.0
hooks:
- id: black
language_version: python3 # Should be a command that runs python3.6+
exclude: aiida_cp2k/workchains/base.py

- repo: https://github.com/PyCQA/flake8
rev: 6.1.0
rev: 7.0.0
hooks:
- id: flake8
args: [--count, --show-source, --statistics]
Expand All @@ -38,13 +38,13 @@ repos:
args: [--profile, black, --filter-files]

- repo: https://github.com/asottile/pyupgrade
rev: v3.15.0
rev: v3.15.2
hooks:
- id: pyupgrade
args: [--py37-plus]

- repo: https://github.com/pre-commit/mirrors-mypy
rev: v1.8.0
rev: v1.9.0
hooks:
- id: mypy
additional_dependencies:
Expand Down
2 changes: 1 addition & 1 deletion conftest.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"""For pytest initialise a test database and profile."""
import subprocess

import subprocess
import pytest

pytest_plugins = ["aiida.manage.tests.pytest_fixtures"]
Expand Down
6 changes: 3 additions & 3 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -305,9 +305,9 @@ def run_apidoc(_):

# See https://stackoverflow.com/a/30144019
env = os.environ.copy()
env[
"SPHINX_APIDOC_OPTIONS"
] = "members,special-members,private-members,undoc-members,show-inheritance"
env["SPHINX_APIDOC_OPTIONS"] = (
"members,special-members,private-members,undoc-members,show-inheritance"
)
subprocess.check_call([cmd_path] + options, env=env)


Expand Down

0 comments on commit b5c642b

Please sign in to comment.