From 072d621bc27fa00601c6aff9ed2babb81069ba46 Mon Sep 17 00:00:00 2001 From: Matthew Bourque Date: Tue, 16 Feb 2021 12:28:50 -0500 Subject: [PATCH 1/4] Added explicity pip dependency --- env/environment-3.6.yml | 1 + env/environment-3.7.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/env/environment-3.6.yml b/env/environment-3.6.yml index cac508dd..686e9df4 100644 --- a/env/environment-3.6.yml +++ b/env/environment-3.6.yml @@ -20,6 +20,7 @@ dependencies: - numpydoc=1.1.0 - pandas=1.1.3 - paramiko=2.7.2 + - pip=20.3.3 - pytest=6.2.2 - python=3.6.7 - pyyaml diff --git a/env/environment-3.7.yml b/env/environment-3.7.yml index a84696ba..97b7ee91 100644 --- a/env/environment-3.7.yml +++ b/env/environment-3.7.yml @@ -20,6 +20,7 @@ dependencies: - numpydoc=1.1.0 - pandas=1.2.0 - paramiko=2.7.2 + - pip=20.3.3 - pytest=6.2.2 - python=3.7.1 - pyyaml From 01f653a29a6d9a1029a301aa08a1f91a8df3881f Mon Sep 17 00:00:00 2001 From: Matthew Bourque Date: Mon, 22 Feb 2021 13:20:08 -0500 Subject: [PATCH 2/4] Adding explicit sphinx install since for some reason it is needed before installling the exoctk conda environment --- ci/setup_conda_env.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/setup_conda_env.sh b/ci/setup_conda_env.sh index 4cbd2e1d..eb706ecd 100755 --- a/ci/setup_conda_env.sh +++ b/ci/setup_conda_env.sh @@ -2,6 +2,7 @@ echo "Creating base conda environment for Python $PYTHON_VERSION" conda create --yes --prefix /home/travis/envs python=$PYTHON_VERSION conda activate /home/travis/envs +conda install sphinx echo "Creating ExoCTK conda environment for Python $PYTHON_VERSION" conda env update -f "env/environment-${PYTHON_VERSION}.yml" || exit 1 From a7475ca5a42ecc701abb81162f500a00247bbb8a Mon Sep 17 00:00:00 2001 From: Matthew Bourque Date: Mon, 22 Feb 2021 13:47:01 -0500 Subject: [PATCH 3/4] Adding explicit numpy install since for some reason it is needed before installling the exoctk conda environment --- ci/setup_conda_env.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/setup_conda_env.sh b/ci/setup_conda_env.sh index eb706ecd..3e60c28e 100755 --- a/ci/setup_conda_env.sh +++ b/ci/setup_conda_env.sh @@ -3,6 +3,7 @@ echo "Creating base conda environment for Python $PYTHON_VERSION" conda create --yes --prefix /home/travis/envs python=$PYTHON_VERSION conda activate /home/travis/envs conda install sphinx +conda install numpy echo "Creating ExoCTK conda environment for Python $PYTHON_VERSION" conda env update -f "env/environment-${PYTHON_VERSION}.yml" || exit 1 From f904af884370f4d6f4a265a5fba01177f748b8e3 Mon Sep 17 00:00:00 2001 From: Matthew Bourque Date: Mon, 22 Feb 2021 14:26:26 -0500 Subject: [PATCH 4/4] Adding explicit flask install since for some reason it is needed before installling the exoctk conda environment --- ci/setup_conda_env.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ci/setup_conda_env.sh b/ci/setup_conda_env.sh index 3e60c28e..fab31ae1 100755 --- a/ci/setup_conda_env.sh +++ b/ci/setup_conda_env.sh @@ -2,8 +2,7 @@ echo "Creating base conda environment for Python $PYTHON_VERSION" conda create --yes --prefix /home/travis/envs python=$PYTHON_VERSION conda activate /home/travis/envs -conda install sphinx -conda install numpy +conda install sphinx numpy flask echo "Creating ExoCTK conda environment for Python $PYTHON_VERSION" conda env update -f "env/environment-${PYTHON_VERSION}.yml" || exit 1