diff options
| author | Joseph Hunkeler <jhunkeler@gmail.com> | 2019-05-12 00:57:55 -0400 |
|---|---|---|
| committer | Joseph Hunkeler <jhunkeler@gmail.com> | 2019-05-12 00:57:55 -0400 |
| commit | e5f7fdda00c5b2c759507a3579af1e738e8d2f95 (patch) | |
| tree | 98a89c31b90709528d681fd554e5c72edc2923b3 /delivery_merge | |
| parent | 84bae5eed1854d0cb4d701f7f9f87d86365e51a7 (diff) | |
| download | delivery_merge-e5f7fdda00c5b2c759507a3579af1e738e8d2f95.tar.gz | |
Ignore upgrade check
Diffstat (limited to 'delivery_merge')
| -rw-r--r-- | delivery_merge/merge.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/delivery_merge/merge.py b/delivery_merge/merge.py index fb291a2..56102b2 100644 --- a/delivery_merge/merge.py +++ b/delivery_merge/merge.py @@ -166,6 +166,9 @@ def integration_test(pkg_data, conda_env, results_root='.'): if 'easy-install.pth' not in proc_pip_stderr: proc_pip.check_returncode() + if 'consider upgrading' not in proc_pip_stderr: + proc_pip.check_returncode() + proc_pytest = sh("pytest", f"-v --junitxml={results}") if proc_pytest.returncode: print(proc_pytest.stderr.decode()) |