Skip to content

Commit

Permalink
More tweak of ruff config
Browse files Browse the repository at this point in the history
  • Loading branch information
dalonsoa committed Nov 4, 2023
1 parent d03329c commit b9ad905
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 13 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -149,4 +149,7 @@ cython_debug/
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
# and can be added to the global gitignore or merged into this file. For a more nuclear
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
.idea/
.idea/

# VScode configuration
.vscode
16 changes: 4 additions & 12 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -56,19 +56,11 @@ doc = [
addopts = "-v -p no:warnings --cov=wsimod --cov-report=html"

[tool.ruff]
select = ["D", "E", "F", "I"] # pydocstyle, pycodestyle, Pyflakes, isort
exclude = ["docs", "tests"] # Let's ignore tests and docs, for now
select = ["E", "F", "I"] # pycodestyle, Pyflakes, isort. Ignoring pydocstyle (D), for now
exclude = ["docs", "tests"] # Let's ignore tests and docs folders, for now

[tool.ruff.per-file-ignores]
"wsimod/*" = ["D104", "D105", "D200", "D205", "D212", "D414", "D415", "D417", "D419", "E501"] # We also ignore docstrings rerated issues, for now
"wsimod/*" = ["E501"] # 176 lines (all comments) are too long (>88). Ignoring, for now

[tool.ruff.pydocstyle]
convention = "google"

[tool.docformatter]
recursive = true
wrap-summaries = 82
wrap-descriptions = 81
blank = true
in-place = true
exclude = [".venv"]
convention = "google"
17 changes: 17 additions & 0 deletions wsimod/nodes/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# ruff: noqa: F401
from wsimod.nodes.catchment import Catchment
from wsimod.nodes.demand import Demand, NonResidentialDemand, ResidentialDemand
from wsimod.nodes.distribution import Distribution, UnlimitedDistribution
from wsimod.nodes.land import Land
from wsimod.nodes.nodes import Node
from wsimod.nodes.sewer import EnfieldFoulSewer, Sewer
from wsimod.nodes.storage import (
Groundwater,
QueueGroundwater,
Reservoir,
River,
RiverReservoir,
Storage,
)
from wsimod.nodes.waste import Waste
from wsimod.nodes.wtw import FWTW, WTW, WWTW

0 comments on commit b9ad905

Please sign in to comment.