From 50ba31489825e32bff90dc87854758d87544713e Mon Sep 17 00:00:00 2001 From: NomakCooper Date: Tue, 27 May 2025 17:07:34 +0000 Subject: [PATCH 1/2] charts - fix plotly 6.1.1 requirements --- plugins/modules/charts.py | 2 +- roles/install_dep/files/requirements.txt | 2 +- tests/integration/targets/charts/tasks/tests.yml | 2 +- tests/unit/requirements.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/modules/charts.py b/plugins/modules/charts.py index 452d827..24f1bb6 100644 --- a/plugins/modules/charts.py +++ b/plugins/modules/charts.py @@ -19,7 +19,7 @@ version_added: "0.1.0" requirements: - requests - - plotly < 6.1.0 + - plotly < 6.1.0 >= 6.1.1 - kaleido options: titlechart: diff --git a/roles/install_dep/files/requirements.txt b/roles/install_dep/files/requirements.txt index 8215a50..54450c5 100644 --- a/roles/install_dep/files/requirements.txt +++ b/roles/install_dep/files/requirements.txt @@ -1,4 +1,4 @@ requests kaleido -plotly < 6.1.0 +plotly openpyxl \ No newline at end of file diff --git a/tests/integration/targets/charts/tasks/tests.yml b/tests/integration/targets/charts/tasks/tests.yml index 02b4b41..44ba723 100644 --- a/tests/integration/targets/charts/tasks/tests.yml +++ b/tests/integration/targets/charts/tasks/tests.yml @@ -7,7 +7,7 @@ name: - requests - kaleido - - plotly<6.1.0 + - plotly - name: Generate a line chart ans2dev.general.charts: diff --git a/tests/unit/requirements.txt b/tests/unit/requirements.txt index c43eb02..4329090 100644 --- a/tests/unit/requirements.txt +++ b/tests/unit/requirements.txt @@ -8,4 +8,4 @@ openpyxl # requirement for the charts module requests kaleido -plotly < 6.1.0 \ No newline at end of file +plotly \ No newline at end of file From 91f29305a6c102c35263928ed50f27ba6be061b6 Mon Sep 17 00:00:00 2001 From: NomakCooper Date: Tue, 27 May 2025 17:18:44 +0000 Subject: [PATCH 2/2] charts - add new changelog fragments --- changelogs/fragments/191-charts-remove-plotly-restriction.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 changelogs/fragments/191-charts-remove-plotly-restriction.yml diff --git a/changelogs/fragments/191-charts-remove-plotly-restriction.yml b/changelogs/fragments/191-charts-remove-plotly-restriction.yml new file mode 100644 index 0000000..70d8614 --- /dev/null +++ b/changelogs/fragments/191-charts-remove-plotly-restriction.yml @@ -0,0 +1,2 @@ +bugfixes: + - charts - remove ``plotly`` version restriction. charts module now works fine with plotly ``6.1.1`` (https://github.com/3A2DEV/ans2dev.general/pull/191). \ No newline at end of file