parent
e20f7b254b
commit
f18e06aaf4
@ -1,52 +0,0 @@
|
|||||||
From f9f51984e14d5d970950d10a8edff5f000196949 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
|
|
||||||
Date: Tue, 2 Jun 2020 19:27:53 +0200
|
|
||||||
Subject: [PATCH] Allow both pre- and post- PEP 610 outputs in
|
|
||||||
test_venv_special_chars_issue252
|
|
||||||
|
|
||||||
pip 20.1+ supports PEP 610 https://www.python.org/dev/peps/pep-0610/
|
|
||||||
Hence the output is changed a bit.
|
|
||||||
This was acknowledged in 553d6f282119481cbd4cf2a78e633eb8b506659e.
|
|
||||||
|
|
||||||
Here we allow to run the tests with pip 19.3.x again
|
|
||||||
by relaxing the regex to match both the old and the new format.
|
|
||||||
---
|
|
||||||
docs/changelog/1594.misc.rst | 1 +
|
|
||||||
tests/unit/test_z_cmdline.py | 2 +-
|
|
||||||
tox.ini | 2 +-
|
|
||||||
3 files changed, 3 insertions(+), 2 deletions(-)
|
|
||||||
create mode 100644 docs/changelog/1594.misc.rst
|
|
||||||
|
|
||||||
diff --git a/docs/changelog/1594.misc.rst b/docs/changelog/1594.misc.rst
|
|
||||||
new file mode 100644
|
|
||||||
index 000000000..f945be2e2
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/docs/changelog/1594.misc.rst
|
|
||||||
@@ -0,0 +1 @@
|
|
||||||
+Allow to run the tests with pip 19.3.1 once again while preserving the ability to use pip 20.1 - by :user:`hroncok`
|
|
||||||
diff --git a/tests/unit/test_z_cmdline.py b/tests/unit/test_z_cmdline.py
|
|
||||||
index 291ef4463..7f3b816d8 100644
|
|
||||||
--- a/tests/unit/test_z_cmdline.py
|
|
||||||
+++ b/tests/unit/test_z_cmdline.py
|
|
||||||
@@ -337,7 +337,7 @@ def test_venv_special_chars_issue252(cmd, initproj):
|
|
||||||
)
|
|
||||||
result = cmd()
|
|
||||||
result.assert_success()
|
|
||||||
- pattern = re.compile("special&&1 installed: .*pkg123 @ .*-0.7.zip.*")
|
|
||||||
+ pattern = re.compile(r"special&&1 installed: .*pkg123( @ .*-|==)0\.7(\.zip)?.*")
|
|
||||||
assert any(pattern.match(line) for line in result.outlines), "\n".join(result.outlines)
|
|
||||||
|
|
||||||
|
|
||||||
diff --git a/tox.ini b/tox.ini
|
|
||||||
index 723bd788a..4e2420c4a 100644
|
|
||||||
--- a/tox.ini
|
|
||||||
+++ b/tox.ini
|
|
||||||
@@ -31,7 +31,7 @@ passenv =
|
|
||||||
PYTEST_*
|
|
||||||
PIP_CACHE_DIR
|
|
||||||
deps =
|
|
||||||
- pip >= 20.1
|
|
||||||
+ pip >= 19.3.1
|
|
||||||
extras = testing
|
|
||||||
commands = pytest \
|
|
||||||
--cov "{envsitepackagesdir}/tox" \
|
|
@ -1 +1 @@
|
|||||||
SHA512 (tox-3.15.1.tar.gz) = 315b9d3de7ab66c1fd774a0f088b522f65150d7b0c3e8ed70ef7051b0b25cda979b8153ee739024356a863e2118dbe9033e24896efcc95820334fe1160d83c32
|
SHA512 (tox-3.15.2.tar.gz) = 2a93f8141986d967d090eaf9d327e418e42357028540cb140da6a6430749a4b41e7f82c9ae57378995b7f3be060b7480d770416a6a21583e06b83b7248ceacf8
|
||||||
|
Loading…
Reference in new issue