From 53b280c531de7f8ed21778ee4c046a5680b3b558 Mon Sep 17 00:00:00 2001 From: amyheather Date: Fri, 12 Jun 2026 14:15:29 +0100 Subject: [PATCH 1/2] build(env): upgrade lintquarto --- environment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yaml b/environment.yaml index ceeb984..58d3880 100644 --- a/environment.yaml +++ b/environment.yaml @@ -22,5 +22,5 @@ dependencies: - distfit==1.8.8 - jupytext==1.17.2 - kaleido==1.1.0 - - lintquarto==0.5.0 + - lintquarto==0.13.0 - sim-tools==1.0.0 From 9edb957e1200f53bbc075a4c9378fd0aee7abf02 Mon Sep 17 00:00:00 2001 From: amyheather Date: Fri, 12 Jun 2026 14:18:58 +0100 Subject: [PATCH 2/2] style(pages): lint --- .flake8 | 4 ++-- .pylintrc | 3 ++- pages/guide/inputs/input_modelling.qmd | 2 +- pages/guide/inputs/parameters_file.qmd | 22 +++++++++++----------- pages/guide/setup/code_structure.qmd | 1 - 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.flake8 b/.flake8 index 9dbe44e..5c25289 100644 --- a/.flake8 +++ b/.flake8 @@ -5,7 +5,7 @@ per-file-ignores = logs*.py: F811 mathematical*.py: F401,F821,E402 n_reps*.py: E0602,F401,F821,W0611 - outputs*.py: F811 + outputs*.py: F811, F821, E0601 parallel*.py: F401,F821 parameters_file*.py: E402,F811,E0102 parameters_validation*.py: F821 @@ -16,4 +16,4 @@ per-file-ignores = tests_resources/*.py: E0401 */outputs_resources/*.py: E261,E262,F821 */parallel_resources/*.py: E261,E262,F821 - */replications_resources/*.py: E261,E262,F821 \ No newline at end of file + */replications_resources/*.py: E261,E262,F821 diff --git a/.pylintrc b/.pylintrc index b444c0a..36cd354 100644 --- a/.pylintrc +++ b/.pylintrc @@ -11,4 +11,5 @@ disable = too-many-arguments, too-many-instance-attributes, too-many-lines, - too-many-positional-arguments \ No newline at end of file + too-many-positional-arguments, + wrong-import-order diff --git a/pages/guide/inputs/input_modelling.qmd b/pages/guide/inputs/input_modelling.qmd index 7307cb2..600cd8f 100644 --- a/pages/guide/inputs/input_modelling.qmd +++ b/pages/guide/inputs/input_modelling.qmd @@ -570,7 +570,7 @@ daily_arrivals_outliers = daily_arrivals.copy() # One very high day and one very low day high_day = pd.to_datetime("2025-02-15") -low_day = pd.to_datetime("2025-03-10") +low_day = pd.to_datetime("2025-03-10") if high_day in daily_arrivals_outliers.index: daily_arrivals_outliers.loc[high_day] *= 3 diff --git a/pages/guide/inputs/parameters_file.qmd b/pages/guide/inputs/parameters_file.qmd index 93f1ea9..8da1a37 100644 --- a/pages/guide/inputs/parameters_file.qmd +++ b/pages/guide/inputs/parameters_file.qmd @@ -80,7 +80,7 @@ There are several file types you can use to store parameters, with **CSV** and * We will make a folder called `inputs` to store our parameter files within. ```{python} -data_path = "inputs" +DATA_PATH = "inputs" ``` ::: @@ -99,7 +99,7 @@ data_path <- file.path("inst", "extdata") ```{python} #| echo: false -data_path = "parameters_file_resources" +DATA_PATH = "parameters_file_resources" ``` ```{r} @@ -117,7 +117,7 @@ For CSV files, use a simple tabular structure and follow tidy data principles - ```{python} # Import and preview parameter file -csv_content = pd.read_csv(os.path.join(data_path, "example_parameters.csv")) +csv_content = pd.read_csv(os.path.join(DATA_PATH, "example_parameters.csv")) HTML(to_html_datatable(csv_content)) ``` @@ -163,7 +163,7 @@ For JSON files, data are stored in hierachical / nested structures. Keep the str ```{python} # Import parameters # pylint:disable=invalid-name -json_file = os.path.join(data_path, "example_parameters.json") +json_file = os.path.join(DATA_PATH, "example_parameters.json") with open(json_file, "r", encoding="utf-8") as f: json_content = json.load(f) @@ -414,7 +414,7 @@ def create_parameters(json_file, number_of_runs=10): return param_dict -param = create_parameters(os.path.join(data_path, "example_parameters.json")) +param = create_parameters(os.path.join(DATA_PATH, "example_parameters.json")) print(json.dumps(param, indent=3)) ``` @@ -447,7 +447,7 @@ def create_parameters(csv_file, number_of_runs=10): return param_dict -param = create_parameters(os.path.join(data_path, "example_parameters.csv")) +param = create_parameters(os.path.join(DATA_PATH, "example_parameters.csv")) print(json.dumps(param, indent=3)) ``` @@ -479,7 +479,7 @@ def create_parameters(csv_file, number_of_runs=10): return dict(param_dict) -param = create_parameters(os.path.join(data_path, "example_parameters.csv")) +param = create_parameters(os.path.join(DATA_PATH, "example_parameters.csv")) print(json.dumps(param, indent=3)) ``` @@ -609,7 +609,7 @@ class CreateParameters: self.number_of_runs = number_of_runs -param = CreateParameters(os.path.join(data_path, "example_parameters.json")) +param = CreateParameters(os.path.join(DATA_PATH, "example_parameters.json")) print(json.dumps(param.__dict__, indent=3)) ``` @@ -642,7 +642,7 @@ class CreateParameters: self.number_of_runs = number_of_runs -param = CreateParameters(os.path.join(data_path, "example_parameters.csv")) +param = CreateParameters(os.path.join(DATA_PATH, "example_parameters.csv")) print(json.dumps(param.__dict__, indent=3)) ``` @@ -678,7 +678,7 @@ class CreateParameters: self.number_of_runs = number_of_runs -param = CreateParameters(os.path.join(data_path, "example_parameters.csv")) +param = CreateParameters(os.path.join(DATA_PATH, "example_parameters.csv")) print(json.dumps(param.__dict__, indent=3)) ``` @@ -771,7 +771,7 @@ def setup_param_from_csv(csv_path): # Import parameters params = setup_param_from_csv( - os.path.join(data_path, "example_parameters.csv") + os.path.join(DATA_PATH, "example_parameters.csv") ) # View object diff --git a/pages/guide/setup/code_structure.qmd b/pages/guide/setup/code_structure.qmd index e01b1e2..253515e 100644 --- a/pages/guide/setup/code_structure.qmd +++ b/pages/guide/setup/code_structure.qmd @@ -38,7 +38,6 @@ date: "2025-09-30T14:35:31+01:00" The following imports are required. These should be available from environment setup on the [Structuring as a package](/pages/guide/setup/package.qmd) page. ```{python} -import numpy as np import pandas as pd ```