diff options
| author | Joseph Hunkeler <jhunkeler@gmail.com> | 2019-05-12 01:52:56 -0400 | 
|---|---|---|
| committer | Joseph Hunkeler <jhunkeler@gmail.com> | 2019-05-12 01:52:56 -0400 | 
| commit | 1ef3febf09d731371e2b86c4df336fc1e96b4645 (patch) | |
| tree | 9bae787c60fa660b67c363e41a40bfdbb997200c | |
| parent | e5f7fdda00c5b2c759507a3579af1e738e8d2f95 (diff) | |
| download | delivery_merge-1ef3febf09d731371e2b86c4df336fc1e96b4645.tar.gz | |
Upgrade pip
| -rw-r--r-- | delivery_merge/merge.py | 8 | 
1 files changed, 7 insertions, 1 deletions
diff --git a/delivery_merge/merge.py b/delivery_merge/merge.py index 56102b2..385424c 100644 --- a/delivery_merge/merge.py +++ b/delivery_merge/merge.py @@ -156,9 +156,15 @@ def integration_test(pkg_data, conda_env, results_root='.'):                  results = os.path.abspath(os.path.join(results_root,                                                         repo_root,                                                         'result.xml')) -                proc_pip = sh("pip", "install -e .[test] pytest ci_watson") +                proc_pip_install = sh("pip", "install --upgrade pip") +                if proc_pip_install.returncode: +                    print(proc_pip_install.stdout.decode()) +                    print(proc_pip_install.stderr.decode()) + +                proc_pip = sh("pip", "install -v -e .[test] pytest ci_watson")                  proc_pip_stderr = proc_pip.stderr.decode()                  if proc_pip.returncode: +                    print(proc_pip.stdout.decode())                      print(proc_pip.stderr.decode())                  # Setuptools is busted in conda. Ignore errors related to  | 
