From bae5f9a763cca4c3f059c1221a22f3ffb2be95cb Mon Sep 17 00:00:00 2001 From: Aaron Weeden Date: Wed, 29 Jan 2025 18:48:51 -0500 Subject: [PATCH 1/6] Test. --- tests/regression/test_datawarehouse_regression.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/regression/test_datawarehouse_regression.py b/tests/regression/test_datawarehouse_regression.py index 7cfb8bf8..4620aa6d 100644 --- a/tests/regression/test_datawarehouse_regression.py +++ b/tests/regression/test_datawarehouse_regression.py @@ -4,6 +4,9 @@ import os import pandas from pathlib import Path +import plotly.express as px +import plotly.io as pio +import xdmod_data.themes import pytest from xdmod_data.warehouse import DataWarehouse @@ -226,3 +229,7 @@ def test_get_durations(valid_dw): expected_durations.append(year) actual_durations = list(valid_dw.get_durations()) assert expected_durations == actual_durations + + +def test_first_example_notebook(): + pio.templates.default = 'timeseries' From a9a138b85d2743db7392d46373a6c81a93075c62 Mon Sep 17 00:00:00 2001 From: Aaron Weeden Date: Wed, 29 Jan 2025 19:11:28 -0500 Subject: [PATCH 2/6] Update test. --- .../test_datawarehouse_regression.py | 43 ++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/tests/regression/test_datawarehouse_regression.py b/tests/regression/test_datawarehouse_regression.py index 4620aa6d..4d7a5b2a 100644 --- a/tests/regression/test_datawarehouse_regression.py +++ b/tests/regression/test_datawarehouse_regression.py @@ -231,5 +231,46 @@ def test_get_durations(valid_dw): assert expected_durations == actual_durations -def test_first_example_notebook(): +def test_first_example_notebook(valid_dw): pio.templates.default = 'timeseries' + with valid_dw: + data = dw.get_data( + duration=('2016-01-01', '2017-12-31'), + realm='Jobs', + metric='Number of Users: Active', + ) + plot = px.line(data, y='Number of Users: Active') + plot.show() + data['Day Name'] = data.index.strftime('%a') + plot = px.box( + data, + x='Day Name', + y='Number of Users: Active', + category_orders={'Day Name': ('Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat')}, + ) + plot.show() + metric_label = 'Number of Users: Active' + with valid_dw: + data = valid_dw.get_data( + duration=('2016-01-01', '2017-12-31'), + realm='Jobs', + metric=metric_label, + dimension='Resource', + ) + plot = px.line(data, labels={'value': metric_label}) + plot.show() + metric_label = 'Number of Users: Active' + with valid_dw: + data = dw.get_data( + duration=('2016-01-01', '2017-12-31'), + realm='Jobs', + metric=metric_label, + dimension='Resource', + dataset_type='aggregate', + ) + plot = px.bar(data, labels={'value': metric_label}) + plot.update_layout( + showlegend=False, + xaxis_automargin=True, + ) + plot.show() From e9b633429fd865f3b337d3bd0c250ead7122b019 Mon Sep 17 00:00:00 2001 From: Aaron Weeden Date: Wed, 29 Jan 2025 19:15:27 -0500 Subject: [PATCH 3/6] Fix test. --- tests/regression/test_datawarehouse_regression.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/regression/test_datawarehouse_regression.py b/tests/regression/test_datawarehouse_regression.py index 4d7a5b2a..30bfdb50 100644 --- a/tests/regression/test_datawarehouse_regression.py +++ b/tests/regression/test_datawarehouse_regression.py @@ -261,7 +261,7 @@ def test_first_example_notebook(valid_dw): plot.show() metric_label = 'Number of Users: Active' with valid_dw: - data = dw.get_data( + data = valid_dw.get_data( duration=('2016-01-01', '2017-12-31'), realm='Jobs', metric=metric_label, From fa24b7e2c9ad691ee4e01a19282e2ad5dca5bca8 Mon Sep 17 00:00:00 2001 From: Aaron Weeden Date: Wed, 29 Jan 2025 19:17:25 -0500 Subject: [PATCH 4/6] Fix test. --- tests/regression/test_datawarehouse_regression.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/regression/test_datawarehouse_regression.py b/tests/regression/test_datawarehouse_regression.py index 30bfdb50..5939ebc3 100644 --- a/tests/regression/test_datawarehouse_regression.py +++ b/tests/regression/test_datawarehouse_regression.py @@ -234,7 +234,7 @@ def test_get_durations(valid_dw): def test_first_example_notebook(valid_dw): pio.templates.default = 'timeseries' with valid_dw: - data = dw.get_data( + data = valid_dw.get_data( duration=('2016-01-01', '2017-12-31'), realm='Jobs', metric='Number of Users: Active', From a2864468d259572b815234f67bfecb7edb7f2840 Mon Sep 17 00:00:00 2001 From: Aaron Weeden Date: Wed, 29 Jan 2025 19:46:46 -0500 Subject: [PATCH 5/6] Lint. --- tests/regression/test_datawarehouse_regression.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/regression/test_datawarehouse_regression.py b/tests/regression/test_datawarehouse_regression.py index 5939ebc3..23981b4d 100644 --- a/tests/regression/test_datawarehouse_regression.py +++ b/tests/regression/test_datawarehouse_regression.py @@ -246,7 +246,9 @@ def test_first_example_notebook(valid_dw): data, x='Day Name', y='Number of Users: Active', - category_orders={'Day Name': ('Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat')}, + category_orders={ + 'Day Name': ('Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'), + }, ) plot.show() metric_label = 'Number of Users: Active' From 3ac7659f2ed48532551ee26ce8ca2863861cb371 Mon Sep 17 00:00:00 2001 From: Aaron Weeden Date: Wed, 29 Jan 2025 19:53:48 -0500 Subject: [PATCH 6/6] Fix linter. --- tests/regression/test_datawarehouse_regression.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/regression/test_datawarehouse_regression.py b/tests/regression/test_datawarehouse_regression.py index 23981b4d..d791fa29 100644 --- a/tests/regression/test_datawarehouse_regression.py +++ b/tests/regression/test_datawarehouse_regression.py @@ -6,7 +6,9 @@ from pathlib import Path import plotly.express as px import plotly.io as pio -import xdmod_data.themes +# The next line is used for the line `pio.templates.default = 'timeseries'`. +# Thus, we don't want the linter to think it is unused. +import xdmod_data.themes # noqa: F401 import pytest from xdmod_data.warehouse import DataWarehouse