From e5f7fdda00c5b2c759507a3579af1e738e8d2f95 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Sun, 12 May 2019 00:57:55 -0400 Subject: Ignore upgrade check --- delivery_merge/merge.py | 3 +++ 1 file changed, 3 insertions(+) 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()) -- cgit