From e793a65e122986b871f283c0dac490fd4388f24d Mon Sep 17 00:00:00 2001 From: Patrick Hoefler Date: Wed, 7 Sep 2022 19:35:46 +0200 Subject: [PATCH 1/2] CI: Pin ipython version --- environment.yml | 2 +- requirements-dev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/environment.yml b/environment.yml index 68c8994326a56..8b61dded395d4 100644 --- a/environment.yml +++ b/environment.yml @@ -61,7 +61,7 @@ dependencies: - botocore - cftime - dask - - ipython + - ipython<8.5.0 - geopandas-base - seaborn - scikit-learn diff --git a/requirements-dev.txt b/requirements-dev.txt index 921ccb54689d0..cadde523b52ca 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -50,7 +50,7 @@ aiobotocore<2.0.0 botocore cftime dask -ipython +ipython<8.5.0 geopandas seaborn scikit-learn From 5af1fd82013efd4239a76824512f23a7eaf38337 Mon Sep 17 00:00:00 2001 From: Patrick Hoefler Date: Wed, 7 Sep 2022 21:32:27 +0200 Subject: [PATCH 2/2] Remove okexcept --- doc/source/user_guide/timeseries.rst | 1 - environment.yml | 2 +- requirements-dev.txt | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/doc/source/user_guide/timeseries.rst b/doc/source/user_guide/timeseries.rst index ed7688f229ca8..474068e43a4d4 100644 --- a/doc/source/user_guide/timeseries.rst +++ b/doc/source/user_guide/timeseries.rst @@ -1981,7 +1981,6 @@ frequency. Arithmetic is not allowed between ``Period`` with different ``freq`` p = pd.Period("2012-01", freq="2M") p + 2 p - 1 - @okexcept p == pd.Period("2012-01", freq="3M") diff --git a/environment.yml b/environment.yml index 8b61dded395d4..68c8994326a56 100644 --- a/environment.yml +++ b/environment.yml @@ -61,7 +61,7 @@ dependencies: - botocore - cftime - dask - - ipython<8.5.0 + - ipython - geopandas-base - seaborn - scikit-learn diff --git a/requirements-dev.txt b/requirements-dev.txt index cadde523b52ca..921ccb54689d0 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -50,7 +50,7 @@ aiobotocore<2.0.0 botocore cftime dask -ipython<8.5.0 +ipython geopandas seaborn scikit-learn