From 5fe7347333911660e7340f2acc233e4d590a6a03 Mon Sep 17 00:00:00 2001 From: Brock Date: Tue, 9 Feb 2021 13:51:27 -0800 Subject: [PATCH 1/3] CI: pin numpydoc --- environment.yml | 2 +- requirements-dev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/environment.yml b/environment.yml index 6376da76bd580..86cd14016ac00 100644 --- a/environment.yml +++ b/environment.yml @@ -114,4 +114,4 @@ dependencies: - natsort # DataFrame.sort_values - pip: - git+https://github.com/pandas-dev/pydata-sphinx-theme.git@2488b7defbd3d753dd5fcfc890fc4a7e79d25103 - - git+https://github.com/numpy/numpydoc + - git+https://github.com/numpy/numpydoc <1.2 # 2021-02-09 1.2dev breaking CI diff --git a/requirements-dev.txt b/requirements-dev.txt index ec9da940ca4ed..d1d1422130af1 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -77,4 +77,4 @@ pyreadstat tabulate>=0.8.3 natsort git+https://github.com/pandas-dev/pydata-sphinx-theme.git@2488b7defbd3d753dd5fcfc890fc4a7e79d25103 -git+https://github.com/numpy/numpydoc +git+https://github.com/numpy/numpydoc <1.2 From dd8051eea013d92b76da6fafe63cd66c427338c9 Mon Sep 17 00:00:00 2001 From: Brock Date: Tue, 9 Feb 2021 14:26:30 -0800 Subject: [PATCH 2/3] try again --- ci/setup_env.sh | 4 ++-- environment.yml | 2 +- requirements-dev.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/setup_env.sh b/ci/setup_env.sh index c36422884f2ec..35152a5691539 100755 --- a/ci/setup_env.sh +++ b/ci/setup_env.sh @@ -86,8 +86,8 @@ else echo "Not using ccache" fi -echo "source deactivate" -source deactivate +echo "conda deactivate" +conda deactivate echo "conda list (root environment)" conda list diff --git a/environment.yml b/environment.yml index 86cd14016ac00..113780ed0264a 100644 --- a/environment.yml +++ b/environment.yml @@ -114,4 +114,4 @@ dependencies: - natsort # DataFrame.sort_values - pip: - git+https://github.com/pandas-dev/pydata-sphinx-theme.git@2488b7defbd3d753dd5fcfc890fc4a7e79d25103 - - git+https://github.com/numpy/numpydoc <1.2 # 2021-02-09 1.2dev breaking CI + - numpydoc < 1.2 # 2021-02-09 1.2dev breaking CI diff --git a/requirements-dev.txt b/requirements-dev.txt index d1d1422130af1..be60c90aef8aa 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -77,4 +77,4 @@ pyreadstat tabulate>=0.8.3 natsort git+https://github.com/pandas-dev/pydata-sphinx-theme.git@2488b7defbd3d753dd5fcfc890fc4a7e79d25103 -git+https://github.com/numpy/numpydoc <1.2 +numpydoc < 1.2 From a9f655b582a38dcdb78793d704a929e6882c5ef9 Mon Sep 17 00:00:00 2001 From: Brock Date: Tue, 9 Feb 2021 15:17:05 -0800 Subject: [PATCH 3/3] revert --- ci/setup_env.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/setup_env.sh b/ci/setup_env.sh index 35152a5691539..c36422884f2ec 100755 --- a/ci/setup_env.sh +++ b/ci/setup_env.sh @@ -86,8 +86,8 @@ else echo "Not using ccache" fi -echo "conda deactivate" -conda deactivate +echo "source deactivate" +source deactivate echo "conda list (root environment)" conda list