From d8e24ce5bcacd0bd8ebed5ef58b2971aa78bdbd1 Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Sun, 15 Apr 2018 18:40:47 -0400 Subject: [PATCH 1/2] Backport PR #11052: Fix CircleCI build. --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index aeaecc820647..d83cb291a2af 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -52,19 +52,19 @@ pip-run: &pip-install # Upgrade pip and setuptools and wheel to get as clean an install as possible name: Upgrade pip, setuptools, wheel command: | - pip install --upgrade --user pip - pip install --upgrade --user wheel - pip install --upgrade --user setuptools + python -mpip install --upgrade --user pip + python -mpip install --upgrade --user wheel + python -mpip install --upgrade --user setuptools deps-run: &deps-install name: Install Python dependencies command: | - pip install --user numpy${NUMPY_VERSION} codecov coverage - pip install --user -r doc-requirements.txt + python -mpip install --user numpy${NUMPY_VERSION} codecov coverage + python -mpip install --user -r doc-requirements.txt mpl-run: &mpl-install name: Install Matplotlib - command: pip install --user -ve . + command: python -mpip install --user -ve . doc-run: &doc-build name: Build documentation From 85a90ae32391e6d01cc4f31334022f55c0acd713 Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Sun, 15 Apr 2018 19:07:03 -0400 Subject: [PATCH 2/2] TST: fix pip install on circleci --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d83cb291a2af..751d58cdd77b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -131,7 +131,7 @@ jobs: NUMPY_VERSION: "==1.7.1" # Linkchecker only works with python 2.7 for the time being. # Linkchecker is currently broken with requests 2.10.0 so force an earlier version. - - run: pip install --user $PRE requests==2.9.2 linkchecker + - run: python -mpip install --user $PRE requests==2.9.2 linkchecker - run: *mpl-install - run: *doc-build