Author: Matti Picus <[email protected]>
Branch: py3.5
Changeset: r95665:ef10a3c9698b
Date: 2019-01-18 12:47 +0200
http://bitbucket.org/pypy/pypy/changeset/ef10a3c9698b/
Log: merge default into branch
diff --git a/pypy/conftest.py b/pypy/conftest.py
--- a/pypy/conftest.py
+++ b/pypy/conftest.py
@@ -15,11 +15,15 @@
rsyncignore = ['_cache']
try:
- from hypothesis import settings
+ from hypothesis import settings, __version__
except ImportError:
pass
else:
- settings.register_profile('default', deadline=None)
+ if __version__[:2] < '3.6':
+ s = settings(deadline=None)
+ settings.register_profile('default', s)
+ else:
+ settings.register_profile('default', deadline=None)
settings.load_profile('default')
# PyPy's command line extra options (these are added
diff --git a/rpython/conftest.py b/rpython/conftest.py
--- a/rpython/conftest.py
+++ b/rpython/conftest.py
@@ -5,6 +5,18 @@
option = None
+try:
+ from hypothesis import settings, __version__
+except ImportError:
+ pass
+else:
+ if __version__[:2] < '3.6':
+ s = settings(deadline=None)
+ settings.register_profile('default', s)
+ else:
+ settings.register_profile('default', deadline=None)
+ settings.load_profile('default')
+
def braindead_deindent(self):
"""monkeypatch that wont end up doing stupid in the python tokenizer"""
text = '\n'.join(self.lines)
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
