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

fix upstream #722

Merged
merged 39 commits into from
Jan 30, 2022
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
d8f7a9a
rm main bottleneck install [test-upstream]
aaronspring Jan 30, 2022
4f234e7
Update upstream-dev-ci.yml
aaronspring Jan 30, 2022
3956576
[test-upstream]
aaronspring Jan 30, 2022
060956d
fix contingency doctest linebreak
aaronspring Jan 30, 2022
590ae5c
doctest ellipsis [test-upstream]
aaronspring Jan 30, 2022
653e113
fix [test-upstream]
aaronspring Jan 30, 2022
9bfe72e
[test-upstream] all_but_latest
aaronspring Jan 30, 2022
455bec2
[test-upstream]
aaronspring Jan 30, 2022
3035891
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 30, 2022
3c079e5
[test-upstream]
aaronspring Jan 30, 2022
fcde298
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 30, 2022
e0cb7ff
Update climpred_testing.yml
aaronspring Jan 30, 2022
a1481b6
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 30, 2022
9e21459
Update climpred_installs.yml
aaronspring Jan 30, 2022
9877ee0
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 30, 2022
a1921e5
Update climpred_installs.yml
aaronspring Jan 30, 2022
eec8d2f
Update climpred_testing.yml
aaronspring Jan 30, 2022
2ee0daf
Delete ci-pre-commit.yml
aaronspring Jan 30, 2022
b4be261
Update upstream-dev-ci.yml
aaronspring Jan 30, 2022
9fca5b3
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 30, 2022
8a5d502
Update climpred_installs.yml
aaronspring Jan 30, 2022
6ecff55
Update climpred_testing.yml
aaronspring Jan 30, 2022
4c6de26
[test-upstream] testing cancelled?
aaronspring Jan 30, 2022
c373779
Update climpred_installs.yml
aaronspring Jan 30, 2022
3d3ab21
Update climpred_testing.yml
aaronspring Jan 30, 2022
5b96861
Update climpred_installs.yml
aaronspring Jan 30, 2022
eafa2d7
Update climpred_testing.yml
aaronspring Jan 30, 2022
4045ef5
Update upstream-dev-ci.yml
aaronspring Jan 30, 2022
65350a0
[test-upstream] check
aaronspring Jan 30, 2022
e169e4a
Delete cancel-duplicate-runs.yaml
aaronspring Jan 30, 2022
a082ddd
Update climpred_installs.yml
aaronspring Jan 30, 2022
73ad6e4
[skip-ci]
aaronspring Jan 30, 2022
f5ddc79
[test-upstream]
aaronspring Jan 30, 2022
b8a64f5
Update climpred/metrics.py
aaronspring Jan 30, 2022
9382a6a
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 30, 2022
2d37978
Update metrics.py
aaronspring Jan 30, 2022
a50240f
[test-upstream]
aaronspring Jan 30, 2022
10a285f
[test-upstream]
aaronspring Jan 30, 2022
e103900
[test-upstream]
aaronspring Jan 30, 2022
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
2 changes: 1 addition & 1 deletion .github/workflows/upstream-dev-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.8"]
python-version: ["3.10"]
outputs:
artifacts_availability: ${{ steps.status.outputs.ARTIFACTS_AVAILABLE }}
steps:
Expand Down
4 changes: 2 additions & 2 deletions ci/install-upstream-wheels.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ conda uninstall -y --force \
dask \
cftime \
nc-time-axis \
bottleneck \
# bottleneck \
xarray \
xskillscore \
xclim \
Expand Down Expand Up @@ -37,7 +37,7 @@ python -m pip install \
git+https://github.com/Unidata/cftime \
git+https://github.com/SciTools/nc-time-axis \
git+https://github.com/pydata/xarray \
git+https://github.com/pydata/bottleneck \
# git+https://github.com/pydata/bottleneck \
git+https://github.com/xarray-contrib/xskillscore \
git+https://github.com/xgcm/xrft \
git+https://github.com/pankajkarman/bias_correction
Expand Down
2 changes: 1 addition & 1 deletion climpred/metrics.py
Original file line number Diff line number Diff line change
Expand Up @@ -3784,7 +3784,7 @@ def _contingency(forecast, verif, score="table", dim=None, **metric_kwargs):
... observation_category_edges=category_edges,
... forecast_category_edges=category_edges,
... ).isel(lead=[0, 1]).SST
<xarray.DataArray 'SST' (lead: 2, observations_category: 3, forecasts_category: 3)>
<xarray.DataArray 'SST' (lead: 2, observations_category: 3, forecast_category: 3)> # doctest: +ELLIPSIS
array([[[221, 29, 0],
[ 53, 217, 0],
[ 0, 0, 0]],
Expand Down