From efc6892f496e6bdf183784e6f79273cc868147d6 Mon Sep 17 00:00:00 2001 From: Bart Schilperoort Date: Sat, 29 Jul 2023 12:41:23 +0200 Subject: [PATCH] Use black to format notebooks --- ...DataStore_functions_slice_mean_max_std_resample.ipynb | 1 + docs/notebooks/09Import_timeseries.ipynb | 6 +++--- docs/notebooks/15Matching_sections.ipynb | 5 +---- pyproject.toml | 9 ++++----- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/docs/notebooks/02Common_DataStore_functions_slice_mean_max_std_resample.ipynb b/docs/notebooks/02Common_DataStore_functions_slice_mean_max_std_resample.ipynb index e230e9fa..ad563848 100644 --- a/docs/notebooks/02Common_DataStore_functions_slice_mean_max_std_resample.ipynb +++ b/docs/notebooks/02Common_DataStore_functions_slice_mean_max_std_resample.ipynb @@ -284,6 +284,7 @@ "source": [ "# We use the logic from xarray to resample. However, it returns an xarray dataset type. Therefore we convert it back to the dtscalibration Datastore type.\n", "from dtscalibration import DataStore\n", + "\n", "ds_resampled = DataStore(ds.resample(time=\"47S\").mean())" ] }, diff --git a/docs/notebooks/09Import_timeseries.ipynb b/docs/notebooks/09Import_timeseries.ipynb index 41c81427..39e06c53 100644 --- a/docs/notebooks/09Import_timeseries.ipynb +++ b/docs/notebooks/09Import_timeseries.ipynb @@ -85,9 +85,9 @@ }, "outputs": [], "source": [ - "ts = pd.read_csv(\n", - " filepath, sep=\",\", index_col=0, parse_dates=True\n", - ")[\"Pt100 2\"] # See pandas' read_csv documentation for more options\n", + "ts = pd.read_csv(filepath, sep=\",\", index_col=0, parse_dates=True)[\n", + " \"Pt100 2\"\n", + "] # See pandas' read_csv documentation for more options\n", "ts = ts.tz_localize(\"Europe/Amsterdam\") # Set the timezone" ] }, diff --git a/docs/notebooks/15Matching_sections.ipynb b/docs/notebooks/15Matching_sections.ipynb index c62ca7c3..a83c3730 100644 --- a/docs/notebooks/15Matching_sections.ipynb +++ b/docs/notebooks/15Matching_sections.ipynb @@ -129,10 +129,7 @@ "rast_var, _ = ds_a.variance_stokes(st_label=\"rast\")\n", "\n", "ds_a.calibration_double_ended(\n", - " st_var=st_var,\n", - " ast_var=ast_var,\n", - " rst_var=rst_var,\n", - " rast_var=rast_var\n", + " st_var=st_var, ast_var=ast_var, rst_var=rst_var, rast_var=rast_var\n", ")\n", "\n", "ds_a.isel(time=0).tmpw.plot(label=\"calibrated\")" diff --git a/pyproject.toml b/pyproject.toml index 8805f9fc..a87b681e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -74,7 +74,7 @@ dev = [ "bump2version", "ruff", "isort", - "black", + "black[jupyter]", "mypy", "types-PyYAML", # for pyyaml types "types-xmltodict", # for xmltodict types @@ -104,11 +104,11 @@ features = ["dev"] [tool.hatch.envs.default.scripts] lint = [ "ruff check .", - "black --check src/", + "black --check .", "isort --check-only --diff .", "mypy src/", ] -format = ["black src/", "isort .", "lint",] +format = ["black .", "isort .", "lint",] test = ["pytest ./src/ ./tests/",] # --doctest-modules coverage = [ "pytest --cov --cov-report term --cov-report xml --junitxml=xunit-result.xml tests/", @@ -186,8 +186,7 @@ line_length = 120 [tool.black] line-length = 88 -target-version = ['py38', 'py39', 'py310'] -include = '\.pyi?$' +target-version = ['py39', 'py310', 'py311'] [tool.mypy] ignore_missing_imports = true # Preferably false, but matplotlib, scipy and statsmodels are missing typing stubs