summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2018-07-16 10:26:06 +0200
committerMichał Górny <mgorny@gentoo.org>2018-07-16 11:26:44 +0200
commit0da652db040029f8d46cf2355dc4a6924164f432 (patch)
treeefc1ce7c72286285a4eb1fa982e38d39ce9bec75 /dev-python/pytest/files
parentgames-simulation/openttd: Added live ebuild. (diff)
downloadgentoo-0da652db040029f8d46cf2355dc4a6924164f432.tar.gz
gentoo-0da652db040029f8d46cf2355dc4a6924164f432.tar.bz2
gentoo-0da652db040029f8d46cf2355dc4a6924164f432.zip
dev-python/pytest: Bump to 3.6.3
Diffstat (limited to 'dev-python/pytest/files')
-rw-r--r--dev-python/pytest/files/pytest-3.6.3-pypy-syntaxerror-offset.patch29
1 files changed, 29 insertions, 0 deletions
diff --git a/dev-python/pytest/files/pytest-3.6.3-pypy-syntaxerror-offset.patch b/dev-python/pytest/files/pytest-3.6.3-pypy-syntaxerror-offset.patch
new file mode 100644
index 00000000000..31dd0054676
--- /dev/null
+++ b/dev-python/pytest/files/pytest-3.6.3-pypy-syntaxerror-offset.patch
@@ -0,0 +1,29 @@
+https://salsa.debian.org/python-team/modules/pytest/commit/405c05a0827592515de76e23c94de1f7773273e6.patch
+
+(updated by mgorny for 3.6.3 -- upstream quoting changes)
+
+From 405c05a0827592515de76e23c94de1f7773273e6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy@debian.org>
+Date: Thu, 10 May 2018 11:42:56 +0200
+Subject: [PATCH] Fix PyPy SyntaxError offset in tests
+
+---
+ testing/code/test_source.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/testing/code/test_source.py b/testing/code/test_source.py
+index fcce3fa..22278d8 100644
+--- a/testing/code/test_source.py
++++ b/testing/code/test_source.py
+@@ -117,7 +117,7 @@ def test_source_strip_multiline():
+ def test_syntaxerror_rerepresentation():
+ ex = pytest.raises(SyntaxError, _pytest._code.compile, "xyz xyz")
+ assert ex.value.lineno == 1
+- assert ex.value.offset in (4, 7) # XXX pypy/jython versus cpython?
++ assert ex.value.offset in (4, 5, 7) # XXX pypy/jython versus cpython?
+ assert ex.value.text.strip(), "x x"
+
+
+--
+2.18.0
+