Bump plotting tests to python 3.10 (#728)

IAMconsortium · Feb 21, 2023 · 8c56dc3 · 8c56dc3
1 parent a9bb3c3
commit 8c56dc3
Show file tree

Hide file tree

Showing 55 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -18,7 +18,7 @@ jobs:
         os:
         - ubuntu-latest
         python-version:
-        - '3.9'
+        - '3.10'
 
       fail-fast: false
 

diff --git a/.github/workflows/pytest-legacy.yml b/.github/workflows/pytest-legacy.yml
@@ -31,4 +31,4 @@ jobs:
       run: pip install .[tests,optional_plotting,optional_io_formats,tutorials]
 
     - name: Test with pytest
-      run: pytest tests --mpl
+      run: pytest tests
diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
@@ -41,16 +41,16 @@ jobs:
       run: pip install .[tests,optional_plotting,optional_io_formats,tutorials]
 
     - name: Test with pytest
-      if: ${{ matrix.python-version != '3.9' }}
+      if: ${{ matrix.python-version != '3.10' }}
       run: pytest tests
 
-    # only execute Matplotlib tests on latest Python version
+    # only execute Matplotlib tests & CodeCov on latest Python version
     - name: Test with pytest including Matplotlib & Codecov
-      if: ${{ matrix.python-version == '3.9' }}
+      if: ${{ matrix.python-version == '3.10' }}
       run: pytest tests --mpl --cov=./ --cov-report=xml
 
     - name: Upload coverage report to Codecov
-      if: ${{ matrix.os == 'ubuntu-latest' && matrix.python-version == '3.9' }}
+      if: ${{ matrix.os == 'ubuntu-latest' && matrix.python-version == '3.10' }}
       uses: codecov/codecov-action@v1
       with:
         file: ./coverage.xml

diff --git a/setup.cfg b/setup.cfg
@@ -36,7 +36,7 @@ install_requires =
     scipy
     pint >= 0.13
     PyYAML
-    matplotlib >= 3.2.0
+    matplotlib >= 3.5.0
     seaborn
     six
     setuptools >= 41

diff --git a/tests/expected_figs/test_add_panel_label.png b/tests/expected_figs/test_add_panel_label.png
diff --git a/tests/expected_figs/test_barplot.png b/tests/expected_figs/test_barplot.png
diff --git a/tests/expected_figs/test_barplot_h.png b/tests/expected_figs/test_barplot_h.png
diff --git a/tests/expected_figs/test_barplot_rc.png b/tests/expected_figs/test_barplot_rc.png
diff --git a/tests/expected_figs/test_barplot_stacked.png b/tests/expected_figs/test_barplot_stacked.png
diff --git a/tests/expected_figs/test_barplot_stacked_net_line.png b/tests/expected_figs/test_barplot_stacked_net_line.png
diff --git a/tests/expected_figs/test_barplot_stacked_order_by_list.png b/tests/expected_figs/test_barplot_stacked_order_by_list.png
diff --git a/tests/expected_figs/test_barplot_stacked_order_by_rc.png b/tests/expected_figs/test_barplot_stacked_order_by_rc.png
diff --git a/tests/expected_figs/test_barplot_title.png b/tests/expected_figs/test_barplot_title.png
diff --git a/tests/expected_figs/test_boxplot.png b/tests/expected_figs/test_boxplot.png
diff --git a/tests/expected_figs/test_boxplot_hue.png b/tests/expected_figs/test_boxplot_hue.png
diff --git a/tests/expected_figs/test_line_PYAM_COLORS.png b/tests/expected_figs/test_line_PYAM_COLORS.png
diff --git a/tests/expected_figs/test_line_color.png b/tests/expected_figs/test_line_color.png
diff --git a/tests/expected_figs/test_line_color_fill_between.png b/tests/expected_figs/test_line_color_fill_between.png
diff --git a/tests/expected_figs/test_line_color_fill_between_interpolate.png b/tests/expected_figs/test_line_color_fill_between_interpolate.png
diff --git a/tests/expected_figs/test_line_color_final_ranges.png b/tests/expected_figs/test_line_color_final_ranges.png
diff --git a/tests/expected_figs/test_line_filter_title.png b/tests/expected_figs/test_line_filter_title.png
diff --git a/tests/expected_figs/test_line_linestyle_legend.png b/tests/expected_figs/test_line_linestyle_legend.png
diff --git a/tests/expected_figs/test_line_marker_legend.png b/tests/expected_figs/test_line_marker_legend.png
diff --git a/tests/expected_figs/test_line_no_legend.png b/tests/expected_figs/test_line_no_legend.png
diff --git a/tests/expected_figs/test_line_plot.png b/tests/expected_figs/test_line_plot.png
diff --git a/tests/expected_figs/test_line_plot_1_var.png b/tests/expected_figs/test_line_plot_1_var.png
diff --git a/tests/expected_figs/test_line_plot_2_vars.png b/tests/expected_figs/test_line_plot_2_vars.png
diff --git a/tests/expected_figs/test_line_plot_bottom_legend.png b/tests/expected_figs/test_line_plot_bottom_legend.png
diff --git a/tests/expected_figs/test_line_plot_cmap_color_arg.png b/tests/expected_figs/test_line_plot_cmap_color_arg.png
diff --git a/tests/expected_figs/test_line_plot_dict_legend.png b/tests/expected_figs/test_line_plot_dict_legend.png
diff --git a/tests/expected_figs/test_line_plot_label.png b/tests/expected_figs/test_line_plot_label.png
diff --git a/tests/expected_figs/test_line_plot_label_color.png b/tests/expected_figs/test_line_plot_label_color.png
diff --git a/tests/expected_figs/test_line_plot_order_by_dict.png b/tests/expected_figs/test_line_plot_order_by_dict.png
diff --git a/tests/expected_figs/test_line_plot_order_by_rc.png b/tests/expected_figs/test_line_plot_order_by_rc.png
diff --git a/tests/expected_figs/test_line_rm_legend_label.png b/tests/expected_figs/test_line_rm_legend_label.png
diff --git a/tests/expected_figs/test_line_single_color.png b/tests/expected_figs/test_line_single_color.png
diff --git a/tests/expected_figs/test_line_update_rc.png b/tests/expected_figs/test_line_update_rc.png
diff --git a/tests/expected_figs/test_pie_plot_colors.png b/tests/expected_figs/test_pie_plot_colors.png
diff --git a/tests/expected_figs/test_pie_plot_labels.png b/tests/expected_figs/test_pie_plot_labels.png
diff --git a/tests/expected_figs/test_pie_plot_legend.png b/tests/expected_figs/test_pie_plot_legend.png
diff --git a/tests/expected_figs/test_pie_plot_other.png b/tests/expected_figs/test_pie_plot_other.png
diff --git a/tests/expected_figs/test_scatter.png b/tests/expected_figs/test_scatter.png
diff --git a/tests/expected_figs/test_scatter_meta.png b/tests/expected_figs/test_scatter_meta.png
diff --git a/tests/expected_figs/test_scatter_variables_with_meta_color.png b/tests/expected_figs/test_scatter_variables_with_meta_color.png
diff --git a/tests/expected_figs/test_scatter_with_lines.png b/tests/expected_figs/test_scatter_with_lines.png
diff --git a/tests/expected_figs/test_stackplot.png b/tests/expected_figs/test_stackplot.png
diff --git a/tests/expected_figs/test_stackplot_missing_zero_issue_266.png b/tests/expected_figs/test_stackplot_missing_zero_issue_266.png
diff --git a/tests/expected_figs/test_stackplot_negative.png b/tests/expected_figs/test_stackplot_negative.png
diff --git a/tests/expected_figs/test_stackplot_negative_emissions.png b/tests/expected_figs/test_stackplot_negative_emissions.png
diff --git a/tests/expected_figs/test_stackplot_negative_emissions_kwargs_custom_total.png b/tests/expected_figs/test_stackplot_negative_emissions_kwargs_custom_total.png
diff --git a/tests/expected_figs/test_stackplot_negative_emissions_kwargs_def_total.png b/tests/expected_figs/test_stackplot_negative_emissions_kwargs_def_total.png
diff --git a/tests/expected_figs/test_stackplot_negative_emissions_with_total.png b/tests/expected_figs/test_stackplot_negative_emissions_with_total.png
diff --git a/tests/expected_figs/test_stackplot_order_by_list.png b/tests/expected_figs/test_stackplot_order_by_list.png
diff --git a/tests/expected_figs/test_stackplot_order_by_rc.png b/tests/expected_figs/test_stackplot_order_by_rc.png
diff --git a/tests/expected_figs/test_stackplot_other.png b/tests/expected_figs/test_stackplot_other.png