From de60519f19ff5f0672bf554ae549d981cab19224 Mon Sep 17 00:00:00 2001 From: Philipp Sommer Date: Mon, 24 Jul 2023 12:00:26 +0200 Subject: [PATCH 1/4] use activate script for activate conda environment --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 13649da..6fe64f1 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -8,7 +8,7 @@ environment: install: # windows config (for installation) - - cmd: "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%" + - cmd: "%PYTHON%\\Scripts\\activate" - cmd: setlocal - cmd: set ANACONDA_API_TOKEN= # conda config From 9c97cfc44a0974792b71a375b4eb4392699e003e Mon Sep 17 00:00:00 2001 From: Philipp Sommer Date: Mon, 24 Jul 2023 13:22:31 +0200 Subject: [PATCH 2/4] update tdqm as well --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 6fe64f1..b492cac 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -13,7 +13,7 @@ install: - cmd: set ANACONDA_API_TOKEN= # conda config - conda config --set always_yes yes --set changeps1 no - - conda update -q conda + - conda update -q conda tqdm - conda install conda-build anaconda-client - pip install -i https://pypi.anaconda.org/psyplot/simple --no-deps psyplot-ci-orb - conda config --add channels conda-forge From d8ac46fcde949a79fe69688ab1a6caa8c56f074d Mon Sep 17 00:00:00 2001 From: Philipp Sommer Date: Mon, 24 Jul 2023 14:38:54 +0200 Subject: [PATCH 3/4] fix tests for matplotlib compatibility --- psyplot/project.py | 3 +- tests/test_project.py | 112 ++++++++++++++++++++++++++++++------------ 2 files changed, 82 insertions(+), 33 deletions(-) diff --git a/psyplot/project.py b/psyplot/project.py index fc8a862..8ccee74 100755 --- a/psyplot/project.py +++ b/psyplot/project.py @@ -48,6 +48,7 @@ import pandas as pd import matplotlib as mpl +from matplotlib.axes import SubplotBase import matplotlib.figure as mfig import numpy as np import psyplot @@ -1666,7 +1667,7 @@ def inspect_axes(ax): for prop in ['linestyle', 'edgecolor', 'linewidth', 'facecolor', 'visible']: ret['spines'][key][prop] = getattr(val, 'get_' + prop)() - if isinstance(ax, mfig.SubplotBase): + if isinstance(ax, SubplotBase): sp = ax.get_subplotspec().get_topmost_subplotspec() ret['grid_spec'] = sp.get_geometry()[:2] ret['subplotspec'] = [sp.num1, sp.num2] diff --git a/tests/test_project.py b/tests/test_project.py index c77d536..a5be010 100644 --- a/tests/test_project.py +++ b/tests/test_project.py @@ -185,13 +185,19 @@ def test_save_and_load_01_simple(self): self.assertEqual(sp[0].psy.ax.get_figure().number, 1) self.assertEqual(get_row_num(sp[0].psy.ax), 0) self.assertEqual(get_col_num(sp[0].psy.ax), 0) - self.assertEqual(sp[0].psy.ax.numCols, 2) - self.assertEqual(sp[0].psy.ax.numRows, 2) + + gs = sp[0].psy.ax.get_gridspec() + + self.assertEqual(gs.ncols, 2) + self.assertEqual(gs.nrows, 2) self.assertEqual(sp[1].psy.ax.get_figure().number, 2) self.assertEqual(get_row_num(sp[1].psy.ax), 0) self.assertEqual(get_col_num(sp[1].psy.ax), 0) - self.assertEqual(sp[1].psy.ax.numCols, 2) - self.assertEqual(sp[1].psy.ax.numRows, 2) + + gs = sp[1].psy.ax.get_gridspec() + + self.assertEqual(gs.ncols, 2) + self.assertEqual(gs.nrows, 2) arr_names = sp.arr_names self.assertEqual(tp.results[arr_names[0] + '.fmt1'], 'test') self.assertEqual(tp.results[arr_names[1] + '.fmt1'], 'test') @@ -205,13 +211,19 @@ def test_save_and_load_01_simple(self): self.assertEqual(sp[0].psy.ax.get_figure().number, 1) self.assertEqual(get_row_num(sp[0].psy.ax), 0) self.assertEqual(get_col_num(sp[0].psy.ax), 0) - self.assertEqual(sp[0].psy.ax.numCols, 2) - self.assertEqual(sp[0].psy.ax.numRows, 2) + + gs = sp[0].psy.ax.get_gridspec() + + self.assertEqual(gs.ncols, 2) + self.assertEqual(gs.nrows, 2) self.assertEqual(sp[1].psy.ax.get_figure().number, 2) self.assertEqual(get_row_num(sp[1].psy.ax), 0) self.assertEqual(get_col_num(sp[1].psy.ax), 0) - self.assertEqual(sp[1].psy.ax.numCols, 2) - self.assertEqual(sp[1].psy.ax.numRows, 2) + + gs = sp[1].psy.ax.get_gridspec() + + self.assertEqual(gs.ncols, 2) + self.assertEqual(gs.nrows, 2) def test_save_and_load_02_alternative_axes(self): """Test the saving and loading of a Project providing alternative axes @@ -226,13 +238,19 @@ def test_save_and_load_02_alternative_axes(self): self.assertEqual(sp[0].psy.ax.get_figure().number, 1) self.assertEqual(get_row_num(sp[0].psy.ax), 0) self.assertEqual(get_col_num(sp[0].psy.ax), 0) - self.assertEqual(sp[0].psy.ax.numCols, 2) - self.assertEqual(sp[0].psy.ax.numRows, 2) + + gs = sp[0].psy.ax.get_gridspec() + + self.assertEqual(gs.ncols, 2) + self.assertEqual(gs.nrows, 2) self.assertEqual(sp[1].psy.ax.get_figure().number, 2) self.assertEqual(get_row_num(sp[1].psy.ax), 0) self.assertEqual(get_col_num(sp[1].psy.ax), 0) - self.assertEqual(sp[1].psy.ax.numCols, 2) - self.assertEqual(sp[1].psy.ax.numRows, 2) + + gs = sp[1].psy.ax.get_gridspec() + + self.assertEqual(gs.ncols, 2) + self.assertEqual(gs.nrows, 2) arr_names = sp.arr_names self.assertEqual(tp.results[arr_names[0] + '.fmt1'], 'test') self.assertEqual(tp.results[arr_names[1] + '.fmt1'], 'test') @@ -247,13 +265,19 @@ def test_save_and_load_02_alternative_axes(self): self.assertEqual(sp[0].psy.ax.get_figure().number, 1) self.assertEqual(get_row_num(sp[0].psy.ax), 0) self.assertEqual(get_col_num(sp[0].psy.ax), 0) - self.assertEqual(sp[0].psy.ax.numCols, 2) - self.assertEqual(sp[0].psy.ax.numRows, 1) + + gs = sp[0].psy.ax.get_gridspec() + + self.assertEqual(gs.ncols, 2) + self.assertEqual(gs.nrows, 1) self.assertEqual(sp[1].psy.ax.get_figure().number, 1) self.assertEqual(get_row_num(sp[1].psy.ax), 0) self.assertEqual(get_col_num(sp[1].psy.ax), 1) - self.assertEqual(sp[1].psy.ax.numCols, 2) - self.assertEqual(sp[1].psy.ax.numRows, 1) + + gs = sp[1].psy.ax.get_gridspec() + + self.assertEqual(gs.ncols, 2) + self.assertEqual(gs.nrows, 1) def test_save_and_load_03_alternative_ds(self): """Test the saving and loading of a Project providing alternative axes @@ -268,13 +292,19 @@ def test_save_and_load_03_alternative_ds(self): self.assertEqual(sp[0].psy.ax.get_figure().number, 1) self.assertEqual(get_row_num(sp[0].psy.ax), 0) self.assertEqual(get_col_num(sp[0].psy.ax), 0) - self.assertEqual(sp[0].psy.ax.numCols, 2) - self.assertEqual(sp[0].psy.ax.numRows, 2) + + gs = sp[0].psy.ax.get_gridspec() + + self.assertEqual(gs.ncols, 2) + self.assertEqual(gs.nrows, 2) self.assertEqual(sp[1].psy.ax.get_figure().number, 2) self.assertEqual(get_row_num(sp[1].psy.ax), 0) self.assertEqual(get_col_num(sp[1].psy.ax), 0) - self.assertEqual(sp[1].psy.ax.numCols, 2) - self.assertEqual(sp[1].psy.ax.numRows, 2) + + gs = sp[1].psy.ax.get_gridspec() + + self.assertEqual(gs.ncols, 2) + self.assertEqual(gs.nrows, 2) arr_names = sp.arr_names self.assertEqual(tp.results[arr_names[0] + '.fmt1'], 'test') self.assertEqual(tp.results[arr_names[1] + '.fmt1'], 'test') @@ -290,13 +320,19 @@ def test_save_and_load_03_alternative_ds(self): self.assertEqual(sp[0].psy.ax.get_figure().number, 1) self.assertEqual(get_row_num(sp[0].psy.ax), 0) self.assertEqual(get_col_num(sp[0].psy.ax), 0) - self.assertEqual(sp[0].psy.ax.numCols, 2) - self.assertEqual(sp[0].psy.ax.numRows, 2) + + gs = sp[0].psy.ax.get_gridspec() + + self.assertEqual(gs.ncols, 2) + self.assertEqual(gs.nrows, 2) self.assertEqual(sp[1].psy.ax.get_figure().number, 2) self.assertEqual(get_row_num(sp[1].psy.ax), 0) self.assertEqual(get_col_num(sp[1].psy.ax), 0) - self.assertEqual(sp[1].psy.ax.numCols, 2) - self.assertEqual(sp[1].psy.ax.numRows, 2) + + gs = sp[1].psy.ax.get_gridspec() + + self.assertEqual(gs.ncols, 2) + self.assertEqual(gs.nrows, 2) self.assertIs(sp[0].psy.base, ds) self.assertIs(sp[1].psy.base, ds) @@ -313,13 +349,19 @@ def test_save_and_load_04_alternative_fname(self): self.assertEqual(sp[0].psy.ax.get_figure().number, 1) self.assertEqual(get_row_num(sp[0].psy.ax), 0) self.assertEqual(get_col_num(sp[0].psy.ax), 0) - self.assertEqual(sp[0].psy.ax.numCols, 2) - self.assertEqual(sp[0].psy.ax.numRows, 2) + + gs = sp[0].psy.ax.get_gridspec() + + self.assertEqual(gs.ncols, 2) + self.assertEqual(gs.nrows, 2) self.assertEqual(sp[1].psy.ax.get_figure().number, 2) self.assertEqual(get_row_num(sp[1].psy.ax), 0) self.assertEqual(get_col_num(sp[1].psy.ax), 0) - self.assertEqual(sp[1].psy.ax.numCols, 2) - self.assertEqual(sp[1].psy.ax.numRows, 2) + + gs = sp[1].psy.ax.get_gridspec() + + self.assertEqual(gs.ncols, 2) + self.assertEqual(gs.nrows, 2) arr_names = sp.arr_names self.assertEqual(tp.results[arr_names[0] + '.fmt1'], 'test') self.assertEqual(tp.results[arr_names[1] + '.fmt1'], 'test') @@ -336,13 +378,19 @@ def test_save_and_load_04_alternative_fname(self): self.assertEqual(sp[0].psy.ax.get_figure().number, 1) self.assertEqual(get_row_num(sp[0].psy.ax), 0) self.assertEqual(get_col_num(sp[0].psy.ax), 0) - self.assertEqual(sp[0].psy.ax.numCols, 2) - self.assertEqual(sp[0].psy.ax.numRows, 2) + + gs = sp[0].psy.ax.get_gridspec() + + self.assertEqual(gs.ncols, 2) + self.assertEqual(gs.nrows, 2) self.assertEqual(sp[1].psy.ax.get_figure().number, 2) self.assertEqual(get_row_num(sp[1].psy.ax), 0) self.assertEqual(get_col_num(sp[1].psy.ax), 0) - self.assertEqual(sp[1].psy.ax.numCols, 2) - self.assertEqual(sp[1].psy.ax.numRows, 2) + + gs = sp[1].psy.ax.get_gridspec() + + self.assertEqual(gs.ncols, 2) + self.assertEqual(gs.nrows, 2) self.assertEqual(psyd.get_filename_ds(sp[0].psy.base)[0], bt.get_file('circumpolar_test.nc')) self.assertEqual(psyd.get_filename_ds(sp[1].psy.base)[0], From b7428fd405ce8cdf81d3f1e8913034d43167c490 Mon Sep 17 00:00:00 2001 From: Philipp Sommer Date: Wed, 17 Jan 2024 15:15:42 +0100 Subject: [PATCH 4/4] trigger ci