From 7be9a92175a8f1a2a800552e4caa3bfa4da8c479 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 19 Jan 2026 19:46:31 +0000 Subject: [PATCH 1/2] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/psf/black-pre-commit-mirror: 25.12.0 → 26.1.0](https://github.com/psf/black-pre-commit-mirror/compare/25.12.0...26.1.0) --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index cb8f1e52..456c5e4f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -16,6 +16,6 @@ repos: - id: check-added-large-files # Code formatting with black - repo: https://github.com/psf/black-pre-commit-mirror - rev: 25.12.0 + rev: 26.1.0 hooks: - id: black From 3c3d19f99da5e2f8d54048cb32420d91070bdfb7 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 19 Jan 2026 19:47:55 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- I_ForcingFiles/Atmos/make_readme.py | 1 - I_ForcingFiles/Atmos/weather.py | 1 - I_ForcingFiles/Initial/make_readme.py | 5 +-- .../LookAtOthersFiles/make_readme.py | 5 +-- I_ForcingFiles/OBC/make_readme.py | 5 +-- I_ForcingFiles/Rivers/make_readme.py | 5 +-- I_ForcingFiles/Tides/make_readme.py | 5 +-- .../notebooks/visualisations/make_readme.py | 5 +-- SalishSeaTools/salishsea_tools/bathy_tools.py | 1 - SalishSeaTools/salishsea_tools/bio_tools.py | 1 + SalishSeaTools/salishsea_tools/data_tools.py | 1 + .../salishsea_tools/diagnosis_tools.py | 1 - SalishSeaTools/salishsea_tools/evaltools.py | 2 +- SalishSeaTools/salishsea_tools/geo_tools.py | 1 + SalishSeaTools/salishsea_tools/gsw_calls.py | 1 - SalishSeaTools/salishsea_tools/hg_commands.py | 2 -- SalishSeaTools/salishsea_tools/nc_tools.py | 1 - .../salishsea_tools/onc_sog_adcps.py | 2 +- SalishSeaTools/salishsea_tools/places.py | 1 - .../salishsea_tools/river_sss150.py | 1 + SalishSeaTools/salishsea_tools/rivertools.py | 1 + SalishSeaTools/salishsea_tools/stormtools.py | 1 - SalishSeaTools/salishsea_tools/teos_tools.py | 2 -- SalishSeaTools/salishsea_tools/tidetools.py | 1 - .../salishsea_tools/unit_conversions.py | 2 -- .../salishsea_tools/visualisations.py | 1 + SalishSeaTools/salishsea_tools/viz_tools.py | 1 - SalishSeaTools/salishsea_tools/wind_tools.py | 2 -- SalishSeaTools/tests/conftest.py | 1 + SalishSeaTools/tests/test_bathy_tools.py | 1 - SalishSeaTools/tests/test_data_tools.py | 31 +++++++------------ .../tests/test_evaltools_datetime.py | 1 - .../tests/test_evaltools_matchData.py | 1 + SalishSeaTools/tests/test_geo_tools.py | 1 + SalishSeaTools/tests/test_nc_tools.py | 1 - SalishSeaTools/tests/test_stormtools.py | 1 + SalishSeaTools/tests/test_teos_tools.py | 1 - SalishSeaTools/tests/test_tidetools.py | 9 ++---- SalishSeaTools/tests/test_unit_conversions.py | 1 - SalishSeaTools/tests/test_viz_tools.py | 1 - SalishSeaTools/tests/test_wind_tools.py | 1 - analysis_tools/make_readme.py | 5 +-- analysis_tools/old_notebooks/make_readme.py | 5 +-- bathymetry/make_readme.py | 1 - update_copyright.py | 1 + 45 files changed, 34 insertions(+), 87 deletions(-) diff --git a/I_ForcingFiles/Atmos/make_readme.py b/I_ForcingFiles/Atmos/make_readme.py index f0f9e55c..8567a0b7 100755 --- a/I_ForcingFiles/Atmos/make_readme.py +++ b/I_ForcingFiles/Atmos/make_readme.py @@ -28,7 +28,6 @@ from pathlib import Path import re - NBVIEWER = "https://nbviewer.org/github" GITHUB_ORG = "SalishSeaCast" REPO_NAME = "tools" diff --git a/I_ForcingFiles/Atmos/weather.py b/I_ForcingFiles/Atmos/weather.py index d0b962d5..e4933a28 100644 --- a/I_ForcingFiles/Atmos/weather.py +++ b/I_ForcingFiles/Atmos/weather.py @@ -17,7 +17,6 @@ observations from the Salish Sea Model. """ - import datetime import netCDF4 as NC import numpy as np diff --git a/I_ForcingFiles/Initial/make_readme.py b/I_ForcingFiles/Initial/make_readme.py index d8c95d8a..24c595a8 100644 --- a/I_ForcingFiles/Initial/make_readme.py +++ b/I_ForcingFiles/Initial/make_readme.py @@ -22,7 +22,6 @@ import os import re - nbviewer = "https://nbviewer.org/urls" repo = "github.com/SalishSeaCast/tools/blob/main" repo_dir = "I_ForcingFiles/Initial" @@ -66,9 +65,7 @@ They are licensed under the Apache License, Version 2.0. https://www.apache.org/licenses/LICENSE-2.0 Please see the LICENSE file for details of the license. -""".format( - this_year=datetime.date.today().year -) +""".format(this_year=datetime.date.today().year) with open("README.md", "wt") as f: f.writelines(readme) f.writelines(license) diff --git a/I_ForcingFiles/LookAtOthersFiles/make_readme.py b/I_ForcingFiles/LookAtOthersFiles/make_readme.py index 71a089d7..44aebc61 100644 --- a/I_ForcingFiles/LookAtOthersFiles/make_readme.py +++ b/I_ForcingFiles/LookAtOthersFiles/make_readme.py @@ -22,7 +22,6 @@ import os import re - nbviewer = "https://nbviewer.org/urls" repo = "github.com/SalishSeaCast/tools/blob/main" repo_dir = "I_ForcingFiles/LookAtOthersFiles" @@ -65,9 +64,7 @@ They are licensed under the Apache License, Version 2.0. https://www.apache.org/licenses/LICENSE-2.0 Please see the LICENSE file for details of the license. -""".format( - this_year=datetime.date.today().year -) +""".format(this_year=datetime.date.today().year) with open("README.md", "wt") as f: f.writelines(readme) f.writelines(license) diff --git a/I_ForcingFiles/OBC/make_readme.py b/I_ForcingFiles/OBC/make_readme.py index 770538be..3f6449ea 100644 --- a/I_ForcingFiles/OBC/make_readme.py +++ b/I_ForcingFiles/OBC/make_readme.py @@ -22,7 +22,6 @@ import os import re - nbviewer = "https://nbviewer.org/urls" repo = "github.com/SalishSeaCast/tools/blob/main" repo_dir = "I_ForcingFiles/OBC" @@ -69,9 +68,7 @@ They are licensed under the Apache License, Version 2.0. https://www.apache.org/licenses/LICENSE-2.0 Please see the LICENSE file for details of the license. -""".format( - this_year=datetime.date.today().year -) +""".format(this_year=datetime.date.today().year) with open("README.md", "wt") as f: f.writelines(readme) f.writelines(license) diff --git a/I_ForcingFiles/Rivers/make_readme.py b/I_ForcingFiles/Rivers/make_readme.py index 7df96f99..79a9e8d0 100644 --- a/I_ForcingFiles/Rivers/make_readme.py +++ b/I_ForcingFiles/Rivers/make_readme.py @@ -22,7 +22,6 @@ import os import re - nbviewer = "https://nbviewer.org/urls" repo = "github.com/SalishSeaCast/tools/blob/main" repo_dir = "I_ForcingFiles/Rivers" @@ -65,9 +64,7 @@ They are licensed under the Apache License, Version 2.0. https://www.apache.org/licenses/LICENSE-2.0 Please see the LICENSE file for details of the license. -""".format( - this_year=datetime.date.today().year -) +""".format(this_year=datetime.date.today().year) with open("README.md", "wt") as f: f.writelines(readme) f.writelines(license) diff --git a/I_ForcingFiles/Tides/make_readme.py b/I_ForcingFiles/Tides/make_readme.py index 2132f395..5e96928a 100644 --- a/I_ForcingFiles/Tides/make_readme.py +++ b/I_ForcingFiles/Tides/make_readme.py @@ -22,7 +22,6 @@ import os import re - nbviewer = "https://nbviewer.org/urls" repo = "github.com/SalishSeaCast/tools/blob/main" repo_dir = "I_ForcingFiles/Tides" @@ -65,9 +64,7 @@ They are licensed under the Apache License, Version 2.0. https://www.apache.org/licenses/LICENSE-2.0 Please see the LICENSE file for details of the license. -""".format( - this_year=datetime.date.today().year -) +""".format(this_year=datetime.date.today().year) with open("README.md", "wt") as f: f.writelines(readme) f.writelines(license) diff --git a/SalishSeaTools/notebooks/visualisations/make_readme.py b/SalishSeaTools/notebooks/visualisations/make_readme.py index a9f79a6d..cefec873 100644 --- a/SalishSeaTools/notebooks/visualisations/make_readme.py +++ b/SalishSeaTools/notebooks/visualisations/make_readme.py @@ -22,7 +22,6 @@ import os import re - nbviewer = "https://nbviewer.org/urls" repo = "github.com/SalishSeaCast/tools/blob/main" repo_dir = "SalishSeaTools/notebooks/visualisations" @@ -69,9 +68,7 @@ They are licensed under the Apache License, Version 2.0. https://www.apache.org/licenses/LICENSE-2.0 Please see the LICENSE file for details of the license. -""".format( - this_year=datetime.date.today().year -) +""".format(this_year=datetime.date.today().year) with open("README.md", "wt") as f: f.writelines(readme) f.writelines(license) diff --git a/SalishSeaTools/salishsea_tools/bathy_tools.py b/SalishSeaTools/salishsea_tools/bathy_tools.py index 18c87cef..4178d868 100644 --- a/SalishSeaTools/salishsea_tools/bathy_tools.py +++ b/SalishSeaTools/salishsea_tools/bathy_tools.py @@ -17,7 +17,6 @@ netCDF bathymetry files. """ - from matplotlib.colors import BoundaryNorm import matplotlib.pyplot as plt from matplotlib.ticker import MaxNLocator diff --git a/SalishSeaTools/salishsea_tools/bio_tools.py b/SalishSeaTools/salishsea_tools/bio_tools.py index cdbe794d..c75e83d0 100644 --- a/SalishSeaTools/salishsea_tools/bio_tools.py +++ b/SalishSeaTools/salishsea_tools/bio_tools.py @@ -14,6 +14,7 @@ # limitations under the License. """Functions for working with geographical data and model results.""" + import numpy as np import f90nml import os diff --git a/SalishSeaTools/salishsea_tools/data_tools.py b/SalishSeaTools/salishsea_tools/data_tools.py index 4d87d63e..9792b8f8 100644 --- a/SalishSeaTools/salishsea_tools/data_tools.py +++ b/SalishSeaTools/salishsea_tools/data_tools.py @@ -14,6 +14,7 @@ # limitations under the License. """Functions for loading and processing observational data""" + import datetime as dtm import ftplib import functools diff --git a/SalishSeaTools/salishsea_tools/diagnosis_tools.py b/SalishSeaTools/salishsea_tools/diagnosis_tools.py index d493221d..05508ad0 100644 --- a/SalishSeaTools/salishsea_tools/diagnosis_tools.py +++ b/SalishSeaTools/salishsea_tools/diagnosis_tools.py @@ -20,7 +20,6 @@ import netCDF4 as nc from salishsea_tools import nc_tools - __all__ = ["pcourantu", "pcourantv", "pcourantw"] diff --git a/SalishSeaTools/salishsea_tools/evaltools.py b/SalishSeaTools/salishsea_tools/evaltools.py index 9e73e525..0c041e9e 100644 --- a/SalishSeaTools/salishsea_tools/evaltools.py +++ b/SalishSeaTools/salishsea_tools/evaltools.py @@ -2734,7 +2734,7 @@ def load_ONC_node_ERDDAP(datelims): }, inplace=True, ) - (obs_pd["j"], obs_pd["i"]) = places.PLACES[node]["NEMO grid ji"] + obs_pd["j"], obs_pd["i"] = places.PLACES[node]["NEMO grid ji"] obs_pd["k"] = places.PLACES[node]["NEMO grid k"] obs_tot.append(obs_pd) diff --git a/SalishSeaTools/salishsea_tools/geo_tools.py b/SalishSeaTools/salishsea_tools/geo_tools.py index ea461dcd..8fa08f7c 100644 --- a/SalishSeaTools/salishsea_tools/geo_tools.py +++ b/SalishSeaTools/salishsea_tools/geo_tools.py @@ -14,6 +14,7 @@ # limitations under the License. """Functions for working with geographical data and model results.""" + import numpy as np import xarray as xr diff --git a/SalishSeaTools/salishsea_tools/gsw_calls.py b/SalishSeaTools/salishsea_tools/gsw_calls.py index d12b0a90..8e557b76 100644 --- a/SalishSeaTools/salishsea_tools/gsw_calls.py +++ b/SalishSeaTools/salishsea_tools/gsw_calls.py @@ -9,7 +9,6 @@ import numpy as np - logger = logging.getLogger(__name__) logger.addHandler(logging.NullHandler()) diff --git a/SalishSeaTools/salishsea_tools/hg_commands.py b/SalishSeaTools/salishsea_tools/hg_commands.py index 2b3c6fc3..386cdcf4 100644 --- a/SalishSeaTools/salishsea_tools/hg_commands.py +++ b/SalishSeaTools/salishsea_tools/hg_commands.py @@ -19,10 +19,8 @@ and modules developed for the SalishSeaCast project. """ - import subprocess - __all__ = [ "commit", "default_url", diff --git a/SalishSeaTools/salishsea_tools/nc_tools.py b/SalishSeaTools/salishsea_tools/nc_tools.py index 2bf00a10..c6a141b2 100644 --- a/SalishSeaTools/salishsea_tools/nc_tools.py +++ b/SalishSeaTools/salishsea_tools/nc_tools.py @@ -25,7 +25,6 @@ netCDF file """ - from collections import namedtuple, OrderedDict from datetime import datetime, timedelta from resource import getrlimit, RLIMIT_NOFILE diff --git a/SalishSeaTools/salishsea_tools/onc_sog_adcps.py b/SalishSeaTools/salishsea_tools/onc_sog_adcps.py index 3a36fb21..442e011d 100644 --- a/SalishSeaTools/salishsea_tools/onc_sog_adcps.py +++ b/SalishSeaTools/salishsea_tools/onc_sog_adcps.py @@ -14,11 +14,11 @@ # limitations under the License. """Ocean Networks Canada Strait of Georgia ADCPs Metadata.""" + from collections import namedtuple import arrow - adcp = namedtuple("ADCP", "device_id, sensor_id") adcps = { # Keys are instrument serial numbers diff --git a/SalishSeaTools/salishsea_tools/places.py b/SalishSeaTools/salishsea_tools/places.py index 3298883a..20f37a8f 100644 --- a/SalishSeaTools/salishsea_tools/places.py +++ b/SalishSeaTools/salishsea_tools/places.py @@ -31,7 +31,6 @@ 'salishsea_tools.places.PLACES: {}'.format(e)) """ - #: Information about geographic places used in the analysis and #: presentation of Salish Sea NEMO model results. PLACES = { diff --git a/SalishSeaTools/salishsea_tools/river_sss150.py b/SalishSeaTools/salishsea_tools/river_sss150.py index 79376535..afa8cb62 100644 --- a/SalishSeaTools/salishsea_tools/river_sss150.py +++ b/SalishSeaTools/salishsea_tools/river_sss150.py @@ -18,6 +18,7 @@ For sss150 Grid and Bathymetry """ + prop_dict = {} # Note that sum is slightly less than 1 as three rivers in the Howe Sound watershed do not enter SSS150 diff --git a/SalishSeaTools/salishsea_tools/rivertools.py b/SalishSeaTools/salishsea_tools/rivertools.py index de52f8db..6179cb59 100644 --- a/SalishSeaTools/salishsea_tools/rivertools.py +++ b/SalishSeaTools/salishsea_tools/rivertools.py @@ -16,6 +16,7 @@ """A collections of functions for working with river flow forcing data for the SalishSeaCast NEMO model. """ + import netCDF4 as NC import numpy as np diff --git a/SalishSeaTools/salishsea_tools/stormtools.py b/SalishSeaTools/salishsea_tools/stormtools.py index d5aa2072..733cf494 100644 --- a/SalishSeaTools/salishsea_tools/stormtools.py +++ b/SalishSeaTools/salishsea_tools/stormtools.py @@ -15,7 +15,6 @@ """A collection of tools for storm surge results from the Salish Sea Model.""" - import csv import datetime from io import BytesIO diff --git a/SalishSeaTools/salishsea_tools/teos_tools.py b/SalishSeaTools/salishsea_tools/teos_tools.py index ef578a64..990719af 100644 --- a/SalishSeaTools/salishsea_tools/teos_tools.py +++ b/SalishSeaTools/salishsea_tools/teos_tools.py @@ -20,10 +20,8 @@ See https://www.teos-10.org/. """ - import numpy as np - #: Conversion factor from practical salinity units (psu) #: to TEOS-10 reference salinity PSU_TEOS = 35.16504 / 35 # g/kg diff --git a/SalishSeaTools/salishsea_tools/tidetools.py b/SalishSeaTools/salishsea_tools/tidetools.py index 85670be1..a2e37e39 100644 --- a/SalishSeaTools/salishsea_tools/tidetools.py +++ b/SalishSeaTools/salishsea_tools/tidetools.py @@ -17,7 +17,6 @@ Salish Sea NEMO model """ - import cmath import collections import csv diff --git a/SalishSeaTools/salishsea_tools/unit_conversions.py b/SalishSeaTools/salishsea_tools/unit_conversions.py index ee024c61..bc8ef0ab 100644 --- a/SalishSeaTools/salishsea_tools/unit_conversions.py +++ b/SalishSeaTools/salishsea_tools/unit_conversions.py @@ -15,7 +15,6 @@ """Salish Sea NEMO model unit conversion functions and constants.""" - import numpy as np # For convenience we import the TEOS-10 salinity conversion factors @@ -28,7 +27,6 @@ teos_psu, ) - __all__ = [ "PSU_TEOS", "TEOS_PSU", diff --git a/SalishSeaTools/salishsea_tools/visualisations.py b/SalishSeaTools/salishsea_tools/visualisations.py index d1c0ad67..01d3322f 100644 --- a/SalishSeaTools/salishsea_tools/visualisations.py +++ b/SalishSeaTools/salishsea_tools/visualisations.py @@ -14,6 +14,7 @@ # limitations under the License. """Functions for common model visualisations""" + import datetime import matplotlib.pyplot as plt diff --git a/SalishSeaTools/salishsea_tools/viz_tools.py b/SalishSeaTools/salishsea_tools/viz_tools.py index 034e569d..8059f92c 100644 --- a/SalishSeaTools/salishsea_tools/viz_tools.py +++ b/SalishSeaTools/salishsea_tools/viz_tools.py @@ -17,7 +17,6 @@ plotting and visualization. """ - import netCDF4 as nc import numpy as np from salishsea_tools import geo_tools diff --git a/SalishSeaTools/salishsea_tools/wind_tools.py b/SalishSeaTools/salishsea_tools/wind_tools.py index e21d3a19..d1cecfbd 100644 --- a/SalishSeaTools/salishsea_tools/wind_tools.py +++ b/SalishSeaTools/salishsea_tools/wind_tools.py @@ -17,7 +17,6 @@ data. """ - from collections import namedtuple from pathlib import Path from datetime import datetime @@ -40,7 +39,6 @@ bearing_heading, ) - __all__ = [ "calc_wind_avg_at_point", "M_PER_S__KM_PER_HR", diff --git a/SalishSeaTools/tests/conftest.py b/SalishSeaTools/tests/conftest.py index d79d5fc4..4ccd47e9 100644 --- a/SalishSeaTools/tests/conftest.py +++ b/SalishSeaTools/tests/conftest.py @@ -14,6 +14,7 @@ # limitations under the License. """Pytest fixtures for the salishsea_tools package.""" + import os import netCDF4 as nc diff --git a/SalishSeaTools/tests/test_bathy_tools.py b/SalishSeaTools/tests/test_bathy_tools.py index 2fab9b08..5f005d9d 100644 --- a/SalishSeaTools/tests/test_bathy_tools.py +++ b/SalishSeaTools/tests/test_bathy_tools.py @@ -16,7 +16,6 @@ """Unit tests for bathy_tools.""" - import os import netCDF4 as nc import numpy as np diff --git a/SalishSeaTools/tests/test_data_tools.py b/SalishSeaTools/tests/test_data_tools.py index ec4fcbdb..e881128b 100644 --- a/SalishSeaTools/tests/test_data_tools.py +++ b/SalishSeaTools/tests/test_data_tools.py @@ -14,6 +14,7 @@ # limitations under the License. """Uni tests for salishsea_tools.data_tools module.""" + import json import json as stdlib_json import logging @@ -62,8 +63,7 @@ class TestOncJsonToDataset: """Unit tests for onc_json_to_dataset() function.""" def test_onc_json_to_dataset_teos_10_salinity(self): - onc_json = json.loads( - """\ + onc_json = json.loads("""\ { "citations": [ "Ocean Networks Canada Society. 2023. Strait of Georgia East Conductivity Temperature Depth Deployed 2023-03-17. Ocean Networks Canada Society. https://doi.org/10.34943/9e6cf493-892f-4da0-9eb4-16254e7da48c." @@ -114,8 +114,7 @@ def test_onc_json_to_dataset_teos_10_salinity(self): } ] } - """ - ) + """) ds = data_tools.onc_json_to_dataset(onc_json) assert ds.attrs["station"] == "SEVIP" @@ -159,8 +158,7 @@ def test_onc_json_to_dataset_teos_10_salinity(self): assert ds.temperature.attrs["actualSamples"] == 2 def test_onc_json_to_dataset_psu_salinity(self): - onc_json = json.loads( - """\ + onc_json = json.loads("""\ { "citations": [ "Ocean Networks Canada Society. 2023. Strait of Georgia East Conductivity Temperature Depth Deployed 2023-03-17. Ocean Networks Canada Society. https://doi.org/10.34943/9e6cf493-892f-4da0-9eb4-16254e7da48c." @@ -195,8 +193,7 @@ def test_onc_json_to_dataset_psu_salinity(self): } ] } - """ - ) + """) ds = data_tools.onc_json_to_dataset(onc_json, teos=False) assert ds.attrs["station"] == "SEVIP" @@ -297,8 +294,7 @@ def test_get_chs_tide_stn_id(self, monkeypatch): def mock_do_chs_iwls_api_request(endpoint, query_params, retry_args): class MockResponse: def json(self): - return stdlib_json.loads( - """\ + return stdlib_json.loads("""\ [ { "id": "5cebf1de3d0f4a073c4bb996", @@ -311,8 +307,7 @@ def json(self): "timeSeries": [] } ] - """ - ) + """) return MockResponse() @@ -402,8 +397,7 @@ def mock_do_chs_iwls_api_request(endpoint, query_params, retry_args): class MockResponse: @staticmethod def json(): - return stdlib_json.loads( - """\ + return stdlib_json.loads("""\ [ { "eventDate": "2021-03-18T00:00:00Z", @@ -430,8 +424,7 @@ def json(): "timeSeriesId": "5cebf1de3d0f4a073c4bb993" } ] - """ - ) + """) return MockResponse() @@ -478,8 +471,7 @@ def mock_do_chs_iwls_api_request(endpoint, query_params, retry_args): class MockResponse: @staticmethod def json(): - return stdlib_json.loads( - """\ + return stdlib_json.loads("""\ [ { "eventDate": "2021-03-19T00:00:00Z", @@ -512,8 +504,7 @@ def json(): "timeSeriesId": "5cebf1de3d0f4a073c4bb991" } ] - """ - ) + """) return MockResponse() diff --git a/SalishSeaTools/tests/test_evaltools_datetime.py b/SalishSeaTools/tests/test_evaltools_datetime.py index 627d1213..1bc07e76 100644 --- a/SalishSeaTools/tests/test_evaltools_datetime.py +++ b/SalishSeaTools/tests/test_evaltools_datetime.py @@ -15,7 +15,6 @@ """Unit tests for evaltools module datetime conversion functions.""" - import datetime import numpy diff --git a/SalishSeaTools/tests/test_evaltools_matchData.py b/SalishSeaTools/tests/test_evaltools_matchData.py index abc06393..dea597b4 100644 --- a/SalishSeaTools/tests/test_evaltools_matchData.py +++ b/SalishSeaTools/tests/test_evaltools_matchData.py @@ -14,6 +14,7 @@ # limitations under the License. """Unit tests for evaltools module matchData() function and its supporting functions.""" + import os from datetime import datetime diff --git a/SalishSeaTools/tests/test_geo_tools.py b/SalishSeaTools/tests/test_geo_tools.py index 2dc11b7c..2c5070c4 100644 --- a/SalishSeaTools/tests/test_geo_tools.py +++ b/SalishSeaTools/tests/test_geo_tools.py @@ -14,6 +14,7 @@ # limitations under the License. """Unit tests for geo_tools module.""" + import numpy as np import pytest diff --git a/SalishSeaTools/tests/test_nc_tools.py b/SalishSeaTools/tests/test_nc_tools.py index 3000af7b..1310ca1e 100644 --- a/SalishSeaTools/tests/test_nc_tools.py +++ b/SalishSeaTools/tests/test_nc_tools.py @@ -15,7 +15,6 @@ """Unit tests for nc_tools.""" - import datetime from pathlib import Path from unittest.mock import patch diff --git a/SalishSeaTools/tests/test_stormtools.py b/SalishSeaTools/tests/test_stormtools.py index e43d6587..5492c7f8 100644 --- a/SalishSeaTools/tests/test_stormtools.py +++ b/SalishSeaTools/tests/test_stormtools.py @@ -14,6 +14,7 @@ # limitations under the License. """Unit tests for SalishSeaTools stormtools module.""" + import os from unittest.mock import Mock diff --git a/SalishSeaTools/tests/test_teos_tools.py b/SalishSeaTools/tests/test_teos_tools.py index 527d6e41..7a594554 100644 --- a/SalishSeaTools/tests/test_teos_tools.py +++ b/SalishSeaTools/tests/test_teos_tools.py @@ -15,7 +15,6 @@ """Unit tests for the teos_tools module.""" - import numpy as np import pytest diff --git a/SalishSeaTools/tests/test_tidetools.py b/SalishSeaTools/tests/test_tidetools.py index bd576a14..22532689 100644 --- a/SalishSeaTools/tests/test_tidetools.py +++ b/SalishSeaTools/tests/test_tidetools.py @@ -15,7 +15,6 @@ """Unit tests for the tidetools module.""" - import textwrap import numpy as np @@ -27,9 +26,7 @@ def test_get_run_length(tmp_path): run_dir = tmp_path / runname run_dir.mkdir() test_namelist = run_dir / "namelist" - test_namelist.write_text( - textwrap.dedent( - """ + test_namelist.write_text(textwrap.dedent(""" !! Run timing control !! !! *Note*: The time step is set in the &namdom namelist in the namelist.domain @@ -92,8 +89,6 @@ def test_get_run_length(tmp_path): rn_rdtmax = 300. ! maximum time step on tracers (used if nn_acc=1) rn_rdth = 300. ! depth variation of tracer time step (used if nn_acc=1) &end - """ - ) - ) + """)) run_length = tidetools.get_run_length("test_run", test_namelist.parent.parent) np.testing.assert_almost_equal(run_length, 2) diff --git a/SalishSeaTools/tests/test_unit_conversions.py b/SalishSeaTools/tests/test_unit_conversions.py index 3ea8bd29..949187d9 100644 --- a/SalishSeaTools/tests/test_unit_conversions.py +++ b/SalishSeaTools/tests/test_unit_conversions.py @@ -15,7 +15,6 @@ """Unit tests for the unit_conversions module.""" - import arrow import numpy as np import pytest diff --git a/SalishSeaTools/tests/test_viz_tools.py b/SalishSeaTools/tests/test_viz_tools.py index 5b1d8f84..7fd49081 100644 --- a/SalishSeaTools/tests/test_viz_tools.py +++ b/SalishSeaTools/tests/test_viz_tools.py @@ -15,7 +15,6 @@ """Unit tests for the viz_tools module.""" - from unittest.mock import ( MagicMock, Mock, diff --git a/SalishSeaTools/tests/test_wind_tools.py b/SalishSeaTools/tests/test_wind_tools.py index a435d1ea..93a4cad2 100644 --- a/SalishSeaTools/tests/test_wind_tools.py +++ b/SalishSeaTools/tests/test_wind_tools.py @@ -15,7 +15,6 @@ """Unit tests for Salish Sea NEMO nowcast make_feeds worker.""" - import os from unittest.mock import patch diff --git a/analysis_tools/make_readme.py b/analysis_tools/make_readme.py index 628b895c..57cc5ca4 100644 --- a/analysis_tools/make_readme.py +++ b/analysis_tools/make_readme.py @@ -23,7 +23,6 @@ import os import re - NBVIEWER = "https://nbviewer.org/urls" REPO = "github.com/SalishSeaCast/tools/blob/main" REPO_DIR = "analysis_tools" @@ -68,9 +67,7 @@ def main(): They are licensed under the Apache License, Version 2.0. https://www.apache.org/licenses/LICENSE-2.0 Please see the LICENSE file for details of the license. -""".format( - this_year=datetime.date.today().year - ) +""".format(this_year=datetime.date.today().year) with open("README.md", "wt") as f: f.writelines(readme) f.writelines(license) diff --git a/analysis_tools/old_notebooks/make_readme.py b/analysis_tools/old_notebooks/make_readme.py index a53976e1..27740d6d 100644 --- a/analysis_tools/old_notebooks/make_readme.py +++ b/analysis_tools/old_notebooks/make_readme.py @@ -22,7 +22,6 @@ import os import re - nbviewer = "https://nbviewer.org/urls" repo = "github.com/SalishSeaCast/tools/blob/main" repo_dir = "analysis_tools/old_notebooks" @@ -68,9 +67,7 @@ They are licensed under the Apache License, Version 2.0. https://www.apache.org/licenses/LICENSE-2.0 Please see the LICENSE file for details of the license. -""".format( - this_year=datetime.date.today().year -) +""".format(this_year=datetime.date.today().year) with open("README.md", "wt") as f: f.writelines(readme) f.writelines(license) diff --git a/bathymetry/make_readme.py b/bathymetry/make_readme.py index 90c613fb..c0cb0592 100644 --- a/bathymetry/make_readme.py +++ b/bathymetry/make_readme.py @@ -28,7 +28,6 @@ from pathlib import Path import re - NBVIEWER = "https://nbviewer.org/github" GITHUB_ORG = "SalishSeaCast" REPO_NAME = "tools" diff --git a/update_copyright.py b/update_copyright.py index 498c2ad5..1b8fa9cd 100644 --- a/update_copyright.py +++ b/update_copyright.py @@ -20,6 +20,7 @@ and updates it to Copyright *{year} """ + from __future__ import print_function import datetime