Skip to content

Commit

Permalink
Merge branch 'develop' into cost_gradient_support
Browse files Browse the repository at this point in the history
  • Loading branch information
HDembinski authored Aug 29, 2023
2 parents 4c9e2f8 + 52b74bd commit c7df295
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 6 deletions.
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ repos:

# Ruff linter, replacement for flake8, pydocstyle, isort
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: 'v0.0.284'
rev: 'v0.0.286'
hooks:
- id: ruff
args: [--fix, --exit-non-zero-on-fix]
args: [--fix, --show-fixes]

# C++ formatting
- repo: https://github.com/pre-commit/mirrors-clang-format
Expand All @@ -62,7 +62,7 @@ repos:

# Python type checking
- repo: https://github.com/pre-commit/mirrors-mypy
rev: 'v1.5.0'
rev: 'v1.5.1'
hooks:
- id: mypy
additional_dependencies: [numpy]
Expand Down
17 changes: 14 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -82,16 +82,27 @@ sdist.include = ["extern/root/math/minuit2/inc", "extern/root/math/minuit2/src"]

[tool.pytest.ini_options]
minversion = "6.0"
addopts = "-q -ra --ff"
addopts = ["-q", "-ra", "--ff", "--strict-config", "--strict-markers"]
log_cli_level = "INFO"
testpaths = ["tests"]
xfail_strict = true
filterwarnings = [
"error::numpy.VisibleDeprecationWarning",
"error::PendingDeprecationWarning",
"error::DeprecationWarning",
"error::FutureWarning",
]

[tool.ruff]
select = ["E", "F", "D"]
extend-ignore = ["D203", "D212", "D200"]
select = [
"E", "F", # flake8
"D", # pydocstyle
]
extend-ignore = ["D203", "D212"]
src = ["src"]
unfixable = [
"F841", # Removes unused variables
]

[tool.ruff.pydocstyle]
convention = "numpy"
Expand Down

0 comments on commit c7df295

Please sign in to comment.