Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI: First changes to try to fix CI. #858

Merged
merged 10 commits into from
Sep 26, 2024
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
zssherman marked this conversation as resolved.
Show resolved Hide resolved
INTERFACE64: ""
mgrover1 marked this conversation as resolved.
Show resolved Hide resolved
Expand All @@ -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: |
Expand Down
5 changes: 2 additions & 3 deletions act/plotting/windrosedisplay.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)):
Expand All @@ -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)
Expand Down
2 changes: 0 additions & 2 deletions continuous_integration/environment_actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
name: act_env
channels:
- conda-forge
- defaults
dependencies:
- cartopy
- pyproj
Expand All @@ -13,7 +12,6 @@ dependencies:
- dask
- xarray
- ipython
- pint=0.8.1
- skyfield
- lxml
- scikit-posthocs
Expand Down
Binary file modified tests/plotting/baseline/test_plot_datarose.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/plotting/baseline/test_stacked_bar_graph3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/plotting/baseline/test_stair_graph2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading