Chg to use graham data transfer node

.pre-commit-config.yaml

@@ -16,6 +16,6 @@ repos:
       - id: check-added-large-files
   # Code formatting with black
   - repo: https://github.com/psf/black
-    rev: 21.9b0
+    rev: 21.12b0
     hooks:
       - id: black

config/nowcast.yaml

@@ -362,7 +362,7 @@ results archive:
   nowcast-agrif: /results/SalishSea/nowcast-agrif.201702/
   hindcast:
     localhost: /results2/SalishSea/hindcast.201905/
-    graham-hindcast: /nearline/rrg-allen/SalishSea/hindcast_long.201905/
+    graham-dtn: /nearline/rrg-allen/SalishSea/hindcast_long.201905/
 
 
 rolling forecasts:
@@ -645,7 +645,7 @@ run:
         Fraser turbidity dir: /home/sallen/MEOPAR/rivers/river_turb/
         weather dir: /home/sallen/MEOPAR/GEM2.5/ops/NEMO-atmos/
 
-    graham-hindcast:
+    graham-dtn:
       ssh key: SalishSeaNEMO-nowcast_id_rsa
       shared storage: False
       make forcing links: False

envs/requirements.txt

@@ -19,8 +19,7 @@ Babel==2.9.1
 backports.functools-lru-cache==1.6.4
 bcrypt==3.2.0
 beautifulsoup4==4.10.0
-black==21.9b0
-bokeh==2.4.1
+bokeh==2.4.2
 Bottleneck==1.3.2
 branca==0.4.2
 brotlipy==0.7.0
@@ -30,20 +29,19 @@ certifi==2021.10.8
 cffi==1.15.0
 cfgv==3.3.1
 cftime==1.5.1.1
-chardet==4.0.0
-charset-normalizer==2.0.0
+charset-normalizer==2.0.8
 click==7.1.2
 click-plugins==1.1.1
-cliff==3.9.0
+cliff==3.10.0
 cligj==0.7.2
 cloudpickle==2.0.0
-cmd2==2.3.0
+cmd2==2.3.3
 cmocean==2.0
 colorama==0.4.4
 coloredlogs==15.0.1
 colorspacious==1.1.2
-coverage==6.1.2
-cryptography==35.0.0
+coverage==6.2
+cryptography==36.0.0
 cycler==0.11.0
 cytoolz==0.11.2
 dask==2021.11.2
@@ -57,10 +55,11 @@ f90nml==1.3.1
 feedgen==0.9.0
 filelock==3.4.0
 Fiona==1.8.20
-folium==0.0.0
-fsspec==2021.11.0
+folium==0.12.1.post1
+fonttools==4.28.3
+fsspec==2021.11.1
 future==0.18.2
-GDAL==3.3.3
+GDAL==3.4.0
 geopandas==0.10.2
 gitdb==4.0.9
 GitPython==3.1.24
@@ -81,12 +80,12 @@ lxml==4.6.4
 Mako==1.1.6
 mapclassify==2.4.3
 MarkupSafe==2.0.1
-matplotlib==3.3.2
+matplotlib==3.5.0
 mock==4.0.3
-more-itertools==8.11.0
-msgpack==1.0.2
+more-itertools==8.12.0
+msgpack==1.0.3
 munch==2.5.0
-mypy-extensions==0.4.3
+munkres==1.1.4
 nc-time-axis==1.4.0
 netCDF4==1.5.8
 networkx==2.6.3
@@ -98,15 +97,14 @@ olefile==0.46
 openpyxl==3.0.9
 packaging==21.3
 pandas==1.3.4
-paramiko==2.8.0
+paramiko==2.8.1
 partd==1.2.0
-pathspec==0.9.0
 pbr==5.8.0
 Pillow==8.4.0
 pip==21.3.1
 platformdirs==2.4.0
 pluggy==1.0.0
-pre-commit==2.15.0
+pre-commit==2.16.0
 prettytable==2.4.0
 psutil==5.8.0
 py==1.11.0
@@ -119,40 +117,42 @@ pyparsing==3.0.6
 PyPDF2==1.26.0
 pyperclip==1.8.2
 pyproj==3.3.0
+PyQt5==5.12.3
+PyQt5_sip==4.19.18
+PyQtChart==5.12
+PyQtWebEngine==5.12.1
 pyshp==2.1.3
 PySocks==1.7.1
 pytest==6.2.5
 pytest-cov==3.0.0
 pytest-forked==1.3.0
-pytest-randomly==3.10.2
+pytest-randomly==3.10.3
 pytest-xdist==2.4.0
 python-dateutil==2.8.2
 python-hglib==2.6.2
 pytz==2021.3
 PyYAML==6.0
 pyzmq==22.3.0
 rasterio==1.2.10
-regex==2021.9.30
 requests==2.26.0
 requests-file==1.5.1
 requests-toolbelt==0.9.1
 retrying==1.3.3
-rstcheck==3.3.1
 Rtree==0.9.7
 schedule==1.1.0
 scikit-learn==1.0.1
-scipy==1.7.2
+scipy==1.7.3
 scour==0.38.2
 sentry-sdk==1.5.0
-setuptools==59.2.0
+setuptools==59.4.0
 Shapely==1.8.0
 six==1.16.0
 smmap==3.0.5
 snowballstemmer==2.2.0
 snuggs==1.4.7
 sortedcontainers==2.4.0
-soupsieve==2.3
-Sphinx==4.3.0
+soupsieve==2.3.1
+Sphinx==4.3.1
 sphinx-rtd-theme==1.0.0
 sphinxcontrib-applehelp==1.0.2
 sphinxcontrib-devhelp==1.0.2
@@ -166,11 +166,11 @@ tables==3.6.1
 tblib==1.7.0
 threadpoolctl==3.0.0
 toml==0.10.2
-tomli==1.2.1
+tomli==1.2.2
 toolz==0.11.2
 tornado==6.1
 tqdm==4.62.3
-typing-extensions==3.10.0.2
+typing_extensions==4.0.1
 urllib3==1.26.7
 utm==0.7.0
 verboselogs==1.7

tests/test_next_workers.py

@@ -708,15 +708,15 @@ def test_success_no_launch_make_forcing_links(
             "run",
             {
                 "enabled hosts": {
-                    "graham-hindcast": {"run types": {}, "make forcing links": False}
+                    "graham-dtn": {"run types": {}, "make forcing links": False}
                 }
             },
         )
         workers = next_workers.after_upload_forcing(
             Message(
                 "upload_forcing",
                 f"success {run_type}",
-                {"graham-hindcast": {run_type: {"run date": "2020-06-29"}}},
+                {"graham-dtn": {run_type: {"run date": "2020-06-29"}}},
             ),
             config,
             checklist,

tests/workers/test_download_results.py

@@ -47,7 +47,7 @@ def config(base_config):
                   nowcast-agrif: SalishSea/nowcast-agrif/
                   hindcast:
                     localhost: SalishSea/hindcast/
-                    graham-hindcast: nearline/SalishSea/hindcast/
+                    graham-dtn: nearline/SalishSea/hindcast/
 
                 run:
                   enabled hosts:
@@ -65,7 +65,7 @@ def config(base_config):
                       run types:
                         nowcast-agrif:
                           results: SalishSea/nowcast-agrif/
-                    graham-hindcast:
+                    graham-dtn:
                       ssh key: SalishSeaNEMO-nowcast_id_rsa
 
                   hindcast hosts:
@@ -172,7 +172,7 @@ def test_enabled_hosts(self, prod_config):
             "arbutus.cloud-nowcast",
             "salish-nowcast",
             "orcinus-nowcast-agrif",
-            "graham-hindcast",
+            "graham-dtn",
             "optimum-hindcast",
         ]
 
@@ -185,7 +185,7 @@ def test_enabled_hosts(self, prod_config):
             ),
             ("salish-nowcast", ["nowcast-dev", "nowcast-green"]),
             ("orcinus-nowcast-agrif", ["nowcast-agrif"]),
-            ("graham-hindcast", []),
+            ("graham-dtn", []),
             ("optimum-hindcast", []),
         ),
     )
@@ -269,7 +269,7 @@ def test_results_archive(self, prod_config):
             "nowcast-agrif": "/results/SalishSea/nowcast-agrif.201702/",
             "hindcast": {
                 "localhost": "/results2/SalishSea/hindcast.201905/",
-                "graham-hindcast": "/nearline/rrg-allen/SalishSea/hindcast_long.201905/",
+                "graham-dtn": "/nearline/rrg-allen/SalishSea/hindcast_long.201905/",
             },
         }
         assert prod_config["results archive"].keys() == archives.keys()
@@ -407,13 +407,13 @@ def mock_tidy_dest_host(*args):
         parsed_args = SimpleNamespace(
             host_name="sockeye-hindcast",
             run_type="hindcast",
-            dest_host="graham-hindcast",
+            dest_host="graham-dtn",
             run_date=arrow.get("2019-09-03"),
         )
         download_results.download_results(parsed_args, config)
         m_run_in_subproc.assert_called_once_with(
             shlex.split(
-                "scp -pr sockeye-hindcast:SalishSea/hindcast/03sep19 graham-hindcast:nearline/SalishSea/hindcast"
+                "scp -pr sockeye-hindcast:SalishSea/hindcast/03sep19 graham-dtn:nearline/SalishSea/hindcast"
             ),
             download_results.logger.debug,
             download_results.logger.error,
@@ -469,7 +469,7 @@ def mock_glob(path, pattern):
 
     @pytest.mark.parametrize(
         "host_name, dest_host",
-        (("optimum-hindcast", "localhost"), ("sockeye-hindcast", "graham-hindcast")),
+        (("optimum-hindcast", "localhost"), ("sockeye-hindcast", "graham-dtn")),
     )
     def test_hindcast_not_unlink_fvcom_boundary_files(
         self,

tests/workers/test_make_forcing_links.py

@@ -144,7 +144,7 @@ def test_enabled_hosts(self, prod_config):
             "arbutus.cloud-nowcast",
             "salish-nowcast",
             "orcinus-nowcast-agrif",
-            "graham-hindcast",
+            "graham-dtn",
             "optimum-hindcast",
         ]
 
@@ -154,7 +154,7 @@ def test_enabled_hosts(self, prod_config):
             ("arbutus.cloud-nowcast", "SalishSeaNEMO-nowcast_id_rsa"),
             ("salish-nowcast", "SalishSeaNEMO-nowcast_id_rsa"),
             ("orcinus-nowcast-agrif", "SalishSeaNEMO-nowcast_id_rsa"),
-            ("graham-hindcast", "SalishSeaNEMO-nowcast_id_rsa"),
+            ("graham-dtn", "SalishSeaNEMO-nowcast_id_rsa"),
             ("optimum-hindcast", "SalishSeaNEMO-nowcast_id_rsa"),
         ),
     )
@@ -181,7 +181,7 @@ def test_ssh_file_template(self, prod_config):
             ("arbutus.cloud-nowcast", "/nemoShare/MEOPAR/sshNeahBay/"),
             ("salish-nowcast", "/results/forcing/sshNeahBay/"),
             ("orcinus-nowcast-agrif", "/home/sallen/MEOPAR/sshNeahBay/"),
-            ("graham-hindcast", "/project/def-allen/SalishSea/forcing/sshNeahBay/"),
+            ("graham-dtn", "/project/def-allen/SalishSea/forcing/sshNeahBay/"),
             (
                 "optimum-hindcast",
                 "/data/sallen/shared/SalishSeaCast/forcing/sshNeahBay/",
@@ -203,7 +203,7 @@ def test_rivers_file_templates(self, prod_config):
             ("arbutus.cloud-nowcast", "/nemoShare/MEOPAR/rivers/"),
             ("salish-nowcast", "/results/forcing/rivers/"),
             ("orcinus-nowcast-agrif", "/home/sallen/MEOPAR/rivers/"),
-            ("graham-hindcast", "/project/def-allen/SalishSea/forcing/rivers/"),
+            ("graham-dtn", "/project/def-allen/SalishSea/forcing/rivers/"),
             ("optimum-hindcast", "/data/sallen/shared/SalishSeaCast/forcing/rivers/"),
         ),
     )
@@ -219,7 +219,7 @@ def test_rivers_dir(self, host, rivers_dir, prod_config):
             ("arbutus.cloud-nowcast", "/nemoShare/MEOPAR/rivers/river_turb/"),
             ("orcinus-nowcast-agrif", "/home/sallen/MEOPAR/rivers/river_turb/"),
             (
-                "graham-hindcast",
+                "graham-dtn",
                 "/project/def-allen/SalishSea/forcing/rivers/river_turb/",
             ),
             (
@@ -250,7 +250,7 @@ def test_weather_file_template(self, prod_config):
             ("salish-nowcast", "/results/forcing/atmospheric/GEM2.5/operational/"),
             ("orcinus-nowcast-agrif", "/home/sallen/MEOPAR/GEM2.5/ops/NEMO-atmos/"),
             (
-                "graham-hindcast",
+                "graham-dtn",
                 "/project/def-allen/SalishSea/forcing/atmospheric/GEM2.5/operational/",
             ),
             (
@@ -277,7 +277,7 @@ def test_temperature_salinity_file_template(self, prod_config):
             ("arbutus.cloud-nowcast", "/nemoShare/MEOPAR/LiveOcean/"),
             ("salish-nowcast", "/results/forcing/LiveOcean/boundary_conditions/"),
             ("orcinus-nowcast-agrif", "/home/sallen/MEOPAR/LiveOcean/"),
-            ("graham-hindcast", "/project/def-allen/SalishSea/forcing/LiveOcean/"),
+            ("graham-dtn", "/project/def-allen/SalishSea/forcing/LiveOcean/"),
             (
                 "optimum-hindcast",
                 "/data/sallen/shared/SalishSeaCast/forcing/LiveOcean/",

tests/workers/test_split_results.py

@@ -102,7 +102,7 @@ def test_results_archive(self, prod_config):
             "nowcast-agrif": "/results/SalishSea/nowcast-agrif.201702/",
             "hindcast": {
                 "localhost": "/results2/SalishSea/hindcast.201905/",
-                "graham-hindcast": "/nearline/rrg-allen/SalishSea/hindcast_long.201905/",
+                "graham-dtn": "/nearline/rrg-allen/SalishSea/hindcast_long.201905/",
             },
         }
         assert prod_config["results archive"].keys() == archives.keys()