Skip to content

Commit

Permalink
Fix CI due to latest pip output change (tox-dev#1579)
Browse files Browse the repository at this point in the history
  • Loading branch information
gaborbernat authored May 11, 2020
1 parent 4167e67 commit 553d6f2
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions tests/unit/test_z_cmdline.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
5 changes: 3 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ envlist = py27,
fix_lint,
docs,
package_description
minversion = 3.7
minversion = 3.12
isolated_build = true
skip_missing_interpreters = true

Expand All @@ -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
Expand All @@ -30,7 +31,7 @@ passenv =
PYTEST_*
PIP_CACHE_DIR
deps =
pip >= 19.3.1
pip >= 20.1
extras = testing
commands = pytest \
--cov "{envsitepackagesdir}/tox" \
Expand Down

0 comments on commit 553d6f2

Please sign in to comment.