From b9ad9059f205d74dfe2c6d9023008f0f1cf82a70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Alonso=20=C3=81lvarez?=
 <d.alonso-alvarez@imperial.ac.uk>
Date: Sat, 4 Nov 2023 15:49:51 +0000
Subject: [PATCH] More tweak of ruff config

---
 .gitignore               |  5 ++++-
 pyproject.toml           | 16 ++++------------
 wsimod/nodes/__init__.py | 17 +++++++++++++++++
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index c353f71..4921f22 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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/
\ No newline at end of file
+.idea/
+
+# VScode configuration
+.vscode
\ No newline at end of file
diff --git a/pyproject.toml b/pyproject.toml
index 688deb4..21f11e6 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -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"]
\ No newline at end of file
+convention = "google"
\ No newline at end of file
diff --git a/wsimod/nodes/__init__.py b/wsimod/nodes/__init__.py
index e69de29..b67eb56 100644
--- a/wsimod/nodes/__init__.py
+++ b/wsimod/nodes/__init__.py
@@ -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