From 24c5abd06a45c4073ec5aa6ba81a091d745183e1 Mon Sep 17 00:00:00 2001 From: Ray Bell Date: Tue, 29 Jun 2021 21:09:26 -0400 Subject: [PATCH] update xhistogram version --- CHANGELOG.rst | 3 ++- ci/dev.yml | 4 +--- ci/doc.yml | 4 +--- ci/docs_notebooks.yml | 4 +--- ci/minimum-tests.yml | 4 +--- requirements.txt | 4 +--- 6 files changed, 7 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index ac493c3f..de976e1e 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,12 +2,13 @@ Changelog History ================= -xskillscore v0.0.22 (2021-XX-XX) +xskillscore v0.0.22 (2021-06-29) -------------------------------- Internal Changes ~~~~~~~~~~~~~~~~ - Created ``np_probabilistic.py`` (:pr:`333`) `Ray Bell`_. +- Require ``xhistogram>=0.3.0`` (:pr:`337`). xskillscore v0.0.21 (2021-06-13) diff --git a/ci/dev.yml b/ci/dev.yml index ab5fd7d0..e1e54e62 100644 --- a/ci/dev.yml +++ b/ci/dev.yml @@ -22,9 +22,7 @@ dependencies: - scikit-learn - scipy - xarray>=0.16.1 - # xhistogram 0.1.3 introduced an error that broke xskillscore - # see https://github.com/xgcm/xhistogram/issues/48 - - xhistogram==0.1.2 + - xhistogram>=0.3.0 # Package Management - asv - black diff --git a/ci/doc.yml b/ci/doc.yml index 978df426..3c729c5b 100644 --- a/ci/doc.yml +++ b/ci/doc.yml @@ -19,8 +19,6 @@ dependencies: - sphinx-autosummary-accessors - toolz - xarray>=0.16.1 - # xhistogram 0.1.3 introduced an error that broke xskillscore - # see https://github.com/xgcm/xhistogram/issues/48 - - xhistogram==0.1.2 + - xhistogram>=0.3.0 - pip: - -e .. diff --git a/ci/docs_notebooks.yml b/ci/docs_notebooks.yml index 9a5ec040..09313670 100644 --- a/ci/docs_notebooks.yml +++ b/ci/docs_notebooks.yml @@ -12,9 +12,7 @@ dependencies: - scikit-learn - scipy - xarray>=0.16.1 - # xhistogram 0.1.3 introduced an error that broke xskillscore - # see https://github.com/xgcm/xhistogram/issues/48 - - xhistogram==0.1.2 + - xhistogram>=0.3.0 - importlib_metadata - ipykernel - jupyterlab diff --git a/ci/minimum-tests.yml b/ci/minimum-tests.yml index 69f47170..2be6d494 100644 --- a/ci/minimum-tests.yml +++ b/ci/minimum-tests.yml @@ -13,9 +13,7 @@ dependencies: - scikit-learn - scipy - xarray>=0.16.1 - # xhistogram 0.1.3 introduced an error that broke xskillscore - # see https://github.com/xgcm/xhistogram/issues/48 - - xhistogram==0.1.2 + - xhistogram>=0.3.0 - coveralls - pytest - pytest-cov diff --git a/requirements.txt b/requirements.txt index c158c2c0..6d3b64c5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,6 +8,4 @@ scikit-learn scipy toolz xarray>=0.16.1 -# xhistogram 0.1.3 introduced an error that broke xskillscore -# see https://github.com/xgcm/xhistogram/issues/48 -xhistogram==0.1.2 +xhistogram>=0.3.0