summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Deutschmann <whissi@gentoo.org>2018-02-24 02:37:45 +0100
committerThomas Deutschmann <whissi@gentoo.org>2018-02-24 04:21:06 +0100
commit836ae4fbbac161b4c2c1e373fd9e2ba182e5091f (patch)
tree9208824c5755461ae8ed4f79daf297bb21da9fed /dev-python/py/files
parentdev-python/attrs: Bump to v17.4.0 (diff)
downloadgentoo-836ae4fbbac161b4c2c1e373fd9e2ba182e5091f.tar.gz
gentoo-836ae4fbbac161b4c2c1e373fd9e2ba182e5091f.tar.bz2
gentoo-836ae4fbbac161b4c2c1e373fd9e2ba182e5091f.zip
dev-python/py: Bump to v1.5.2
Package-Manager: Portage-2.3.24, Repoman-2.3.6
Diffstat (limited to 'dev-python/py/files')
-rw-r--r--dev-python/py/files/py-1.5.2-skip-apiwarn-pytest31.patch14
1 files changed, 14 insertions, 0 deletions
diff --git a/dev-python/py/files/py-1.5.2-skip-apiwarn-pytest31.patch b/dev-python/py/files/py-1.5.2-skip-apiwarn-pytest31.patch
new file mode 100644
index 000000000000..36727df9366b
--- /dev/null
+++ b/dev-python/py/files/py-1.5.2-skip-apiwarn-pytest31.patch
@@ -0,0 +1,14 @@
+https://github.com/pytest-dev/py/issues/162
+
+--- a/testing/log/test_warning.py
++++ b/testing/log/test_warning.py
+@@ -8,8 +8,7 @@ import py
+ mypath = py.path.local(__file__).new(ext=".py")
+
+
+-win = sys.platform.startswith('win')
+-pytestmark = pytest.mark.skipif(win and LooseVersion(pytest.__version__) >= LooseVersion('3.1'),
++pytestmark = pytest.mark.skipif(LooseVersion(pytest.__version__) >= LooseVersion('3.1'),
+ reason='apiwarn is not compatible with pytest >= 3.1 (#162)')
+
+