diff options
| author | Bernát Gábor <bgabor8@bloomberg.net> | 2020-05-11 12:15:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-11 12:15:24 +0100 |
| commit | 553d6f282119481cbd4cf2a78e633eb8b506659e (patch) | |
| tree | 6f4d97369c7715eec96ffbe719976fdac863dd6d | |
| parent | 4167e671c293410e2e2ec693876a23ff9441b8aa (diff) | |
| download | tox-git-553d6f282119481cbd4cf2a78e633eb8b506659e.tar.gz | |
Fix CI due to latest pip output change (#1579)
| -rw-r--r-- | tests/unit/test_z_cmdline.py | 4 | ||||
| -rw-r--r-- | tox.ini | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/tests/unit/test_z_cmdline.py b/tests/unit/test_z_cmdline.py index e809f1d7..3a2b336c 100644 --- a/tests/unit/test_z_cmdline.py +++ b/tests/unit/test_z_cmdline.py @@ -337,8 +337,8 @@ def test_venv_special_chars_issue252(cmd, initproj): ) result = cmd() result.assert_success() - pattern = re.compile("special&&1 installed: .*pkg123==0.7.*") - assert any(pattern.match(line) for line in result.outlines), result.outlines + pattern = re.compile("special&&1 installed: .*pkg123 @ .*-0.7.zip.*") + assert any(pattern.match(line) for line in result.outlines), "\n".join(result.outlines) def test_unknown_environment(cmd, initproj): @@ -11,7 +11,7 @@ envlist = py27, fix_lint, docs, package_description -minversion = 3.7 +minversion = 3.12 isolated_build = true skip_missing_interpreters = true @@ -20,6 +20,7 @@ description = run the tests with pytest under {basepython} setenv = PIP_DISABLE_PIP_VERSION_CHECK = 1 COVERAGE_FILE = {env:COVERAGE_FILE:{toxworkdir}/.coverage.{envname}} + {py27,pypy}: PYTHONWARNINGS=ignore:DEPRECATION::pip._internal.cli.base_command passenv = CURL_CA_BUNDLE http_proxy @@ -30,7 +31,7 @@ passenv = PYTEST_* PIP_CACHE_DIR deps = - pip >= 19.3.1 + pip >= 20.1 extras = testing commands = pytest \ --cov "{envsitepackagesdir}/tox" \ |