diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 68c2d8e77f..7d545578d1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,7 +34,7 @@ jobs: matrix: python-version: ["3.9", "3.10", "3.11", "3.12"] os: [macOS, ubuntu, Windows] - inlcude: + include: - os: macos-latest PLAT: arm64 INTERFACE64: "" @@ -49,6 +49,7 @@ jobs: create-args: python=${{ matrix.python-version }} environment-file: ./continuous_integration/environment_actions.yml environment-name: act_env + micromamba-version: 1.5.10-0 - name: Install ACT run: | diff --git a/act/plotting/windrosedisplay.py b/act/plotting/windrosedisplay.py index fe99f41c62..b18aa62e17 100644 --- a/act/plotting/windrosedisplay.py +++ b/act/plotting/windrosedisplay.py @@ -407,9 +407,9 @@ def plot_data( # Produce direction (x-axis) and speed (y-axis) plots displaying the mean # as the contours. spd_data = ds[spd_field].values - spd_bins = np.linspace(0, ds[spd_field].max(), num_data_bins + 1) + spd_bins = np.linspace(0, ds[spd_field].max().values, num_data_bins + 1) spd_bins = np.insert(spd_bins, 1, calm_threshold) - # Set up an array and cycle through the data, binning them by speed/direction + # Set up an array and cycle through the data, binning them by speed/direction mean_data = np.zeros([len(bins), len(spd_bins)]) for i in range(len(bins) - 1): for j in range(len(spd_bins)): @@ -432,7 +432,6 @@ def plot_data( mean_data = np.insert(mean_data, -1, mean_data[0, :], axis=0) bins.append(bins[0]) mean_data[-1, :] = mean_data[0, :] - # In order to properly handle vmin/vmax in contours, need to adjust # the levels plotted and remove the keywords to contourf vmin = np.nanmin(mean_data) diff --git a/continuous_integration/environment_actions.yml b/continuous_integration/environment_actions.yml index 1351459a6f..da833c229e 100644 --- a/continuous_integration/environment_actions.yml +++ b/continuous_integration/environment_actions.yml @@ -2,7 +2,6 @@ name: act_env channels: - conda-forge - - defaults dependencies: - cartopy - pyproj @@ -13,7 +12,6 @@ dependencies: - dask - xarray - ipython - - pint=0.8.1 - skyfield - lxml - scikit-posthocs @@ -28,12 +26,11 @@ dependencies: - cmweather - moviepy - ruff + - metpy + - arm_pyart - pip - pip: - mpl2nc - - metpy - pysp2 - - arm_pyart - icartt - - aiohttp>=3.9.0b1 - git+https://github.com/ARM-DOE/arm-test-data.git diff --git a/tests/plotting/baseline/test_plot_datarose.png b/tests/plotting/baseline/test_plot_datarose.png index 1b85fb841e..7abf087bcd 100644 Binary files a/tests/plotting/baseline/test_plot_datarose.png and b/tests/plotting/baseline/test_plot_datarose.png differ diff --git a/tests/plotting/baseline/test_stacked_bar_graph3.png b/tests/plotting/baseline/test_stacked_bar_graph3.png index 64ece6b91f..e334bba634 100644 Binary files a/tests/plotting/baseline/test_stacked_bar_graph3.png and b/tests/plotting/baseline/test_stacked_bar_graph3.png differ diff --git a/tests/plotting/baseline/test_stair_graph2.png b/tests/plotting/baseline/test_stair_graph2.png index 1ad8a2e48c..8f156f6699 100644 Binary files a/tests/plotting/baseline/test_stair_graph2.png and b/tests/plotting/baseline/test_stair_graph2.png differ