prepare release 0.8.0 (#207)

* updated changes

* update requirements

* update bokeh and pre-commit

.pre-commit-config.yaml

@@ -3,7 +3,7 @@ default_language_version:
 
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.4.0
+    rev: v4.2.0
     hooks:
     -   id: trailing-whitespace
         language_version: python3
@@ -16,11 +16,11 @@ repos:
     -   id: debug-statements
         language_version: python3
 -   repo: https://github.com/ambv/black
-    rev: 22.1.0
+    rev: 22.3.0
     hooks:
     -   id: black
         language_version: python3
-        args: ["--target-version", "py36"]
+        args: ["--target-version", "py37"]
 -   repo: https://github.com/pycqa/flake8
     rev: 3.9.1
     hooks:

CHANGES.rst

@@ -1,6 +1,19 @@
 Changes
 *******
 
+0.8.0 (2022-04-14)
+==================
+
+* Added "average" and "average_time" operators (#191, #206).
+* Removed "diff" operator (#204).
+* Cleaned up workflow and tests (#205).
+* Added changes for CMIP6 decadal (#202).
+* Updated to daops 0.8.0 (#207).
+* Updated to clisops 0.9.0 (#207).
+* Updated to latest bokeh 2.4.2 in dashboard (#207).
+* Updated pre-commit (#207).
+* Updated pywps 4.5.2 (#203, #207).
+
 0.7.0 (2021-11-08)
 ==================
 

environment.yml

@@ -5,7 +5,7 @@ channels:
 dependencies:
 - pip
 - python=3.7 # >=3.6,<3.8
-- pywps>=4.5.1,<4.6
+- pywps>=4.5.2,<4.6
 - jinja2
 - click
 - psutil
@@ -16,8 +16,8 @@ dependencies:
 - dask>=2021.12
 - netcdf4>=1.4
 - bottleneck>=1.3.1,<1.4
-#- daops>=0.7.0,<0.8
-#- clisops>=0.8.0,<0.9
+- daops>=0.8.0,<0.9
+- clisops>=0.9.0,<0.10
 - roocs-utils>=0.5.0,<0.6
 # workflow
 - networkx
@@ -27,9 +27,9 @@ dependencies:
 - graphviz
 # catalog
 - intake
-- pandas>=1.3.5
+- pandas>=1.3.5,<1.4
 - aiohttp
 # dashboard
-- bokeh=2.4.1
+- bokeh>=2.4.2,<2.5
 # tests
 - pytest

requirements.txt

@@ -1,11 +1,11 @@
-pywps>=4.5.1,<4.6
+pywps>=4.5.2,<4.6
 jinja2
 click
 psutil
 # daops
-# daops>=0.7.0,<0.8
-daops @ git+https://github.com/roocs/daops@master#egg=daops
-#clisops>=0.8.0,<0.9
+daops>=0.8.0,<0.9
+# daops @ git+https://github.com/roocs/daops@master#egg=daops
+clisops>=0.9.0,<0.10
 roocs-utils>=0.5.0,<0.6
 xarray>=0.20
 dask[complete]
@@ -17,8 +17,8 @@ prov>=2.0.0
 pydot
 # catalog
 intake
-pandas>=1.3.5
+pandas>=1.3.5,<1.4
 aiohttp
 # dashboard
-bokeh>=2.4.1
+bokeh>=2.4.2,<2.5
 humanize

rook/dashboard/dashboard.py

@@ -1,6 +1,7 @@
 import os
 import pandas as pd
 import humanize
+import bokeh
 
 from .plots import ActivityPlot, DurationPlot, ConcurrencyPlot, PulsePlot
 from .plots import DownloadsPlot, TransferPlot
@@ -61,6 +62,7 @@ def render(self):
         script_t1, table_1 = OverviewTable(self.df, self.df_downloads).components()
         script_t2, table_2 = MessageTable(self.df).components()
         return template.render(
+            bokeh_version=bokeh.__version__,
             time_start=humanize.naturaldate(min(self.df["time_start"])),
             time_end=humanize.naturaldate(max(self.df["time_start"])),
             plot_1=plot_1,

rook/dashboard/templates/base.html

@@ -9,8 +9,8 @@
     <!-- Bootstrap CSS -->
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.1/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-+0n0xVW2eSR5OomGNYDnhzAbDsOXxcvSN1TPprVMTNDbiYZCxYbOOl7+AMvyTG2x" crossorigin="anonymous">
     <!-- Bokeh CSS -->
-    <link href="http://cdn.pydata.org/bokeh/release/bokeh-2.4.1.min.css" rel="stylesheet">
-    <link href="http://cdn.pydata.org/bokeh/release/bokeh-widgets-2.4.1.min.css" rel="stylesheet">
+    <link href="http://cdn.pydata.org/bokeh/release/bokeh-{{ bokeh_version }}.min.css" rel="stylesheet">
+    <link href="http://cdn.pydata.org/bokeh/release/bokeh-widgets-{{ bokeh_version }}.min.css" rel="stylesheet">
 
     <title>Rook - Dashboard</title>
 </head>
@@ -20,9 +20,9 @@
     {% endblock %}
 
     <!-- Bokeh -->
-    <script src="https://cdn.bokeh.org/bokeh/release/bokeh-2.4.1.min.js"></script>
-    <script src="https://cdn.bokeh.org/bokeh/release/bokeh-widgets-2.4.1.min.js"></script>
-    <script src="https://cdn.bokeh.org/bokeh/release/bokeh-tables-2.4.1.min.js"></script>
+    <script src="https://cdn.bokeh.org/bokeh/release/bokeh-{{ bokeh_version }}.min.js"></script>
+    <script src="https://cdn.bokeh.org/bokeh/release/bokeh-widgets-{{ bokeh_version }}.min.js"></script>
+    <script src="https://cdn.bokeh.org/bokeh/release/bokeh-tables-{{ bokeh_version }}.min.js"></script>
 
     <!-- Bootstrap Bundle with Popper -->
     <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.1/dist/js/bootstrap.bundle.min.js" integrity="sha384-gtEjrD/SeCtmISkJkNUaaKMoLD0//ElJ19smozuHV6z3Iehds+3Ulb9Bn9Plx0x4" crossorigin="anonymous"></script>

tests/test_dashboard.py

@@ -7,8 +7,11 @@
 def test_dashboard(tmpdir):
     dash = Dashboard(output_dir=tmpdir)
     dash.load(
-        "http://rook4.cloud.dkrz.de:80/outputs/rook/9e3ae300-d044-11eb-8ce3-fa163e1098db/wps_requests.csv",
+        "http://rook4.cloud.dkrz.de/outputs/rook/64413a5a-bbda-11ec-9cfa-fa163ed6c06f/wps_requests.csv",
         filter="orchestrate",
     )
+    dash.load_downloads(
+        "http://rook4.cloud.dkrz.de/outputs/rook/64413a5a-bbda-11ec-9cfa-fa163ed6c06f/downloads.csv"
+    )
     print(dash.write())
     # assert False