Merge branch '1.10.x'

Author: DRMacIver

docs/changes.rst

@@ -21,6 +21,33 @@ Hypothesis APIs come in three flavours:
 You should generally assume that an API is internal unless you have specific
 information to the contrary.
 
+-----------------------------------------------------------------------
+`1.10.3 <https://hypothesis.readthedocs.org/en/v1.10.2/>`_ - 2015-08-19
+-----------------------------------------------------------------------
+
+Another small bug fix release.
+
+* lists(elements, unique_by=some_function, min_size=n) would have raised a
+  ValidationError if n > Settings.default.average_list_length because it would
+  have wanted to use an average list length shorter than the minimum size of
+  the list, which is impossible. Now it instead defaults to twice the minimum
+  size in these circumstances.
+* basic() strategy would have only ever produced at most ten distinct values
+  per run of the test (which is bad if you e.g. have it inside a list). This
+  was obviously silly. It will now produce a much better distribution of data,
+  both duplicated and non duplicated.
+
+
+-----------------------------------------------------------------------
+`1.10.2 <https://hypothesis.readthedocs.org/en/v1.10.2/>`_ - 2015-08-19
+-----------------------------------------------------------------------
+
+This is a small bug fix release:
+
+* star imports from hypothesis should now work correctly.
+* example quality for examples using flatmap will be better, as the way it had
+  previously been implemented was causing problems where Hypothesis was
+  erroneously labelling some examples as being duplicates.
 
 -----------------------------------------------------------------------
 `1.10.0 <https://hypothesis.readthedocs.org/en/v1.10.0/>`_ - 2015-08-04

hypothesis-extra/hypothesis-pytest/setup.py

@@ -43,7 +43,7 @@ def run_tests(self):
 
 setup(
     name='hypothesis-pytest',
-    version='0.16.0',
+    version='0.17.0',
     author='David R. MacIver',
     author_email='david@drmaciver.com',
     packages=find_packages(SOURCE),

hypothesis-extra/hypothesis-pytest/tests/test_mark.py

@@ -1,5 +1,4 @@
-from __future__ import division, print_function, absolute_import, \
-    unicode_literals
+from __future__ import division, print_function, absolute_import
 
 # coding=utf-8
 

hypothesis-extra/hypothesis-pytest/tests/test_reporting.py

@@ -1,5 +1,4 @@
-from __future__ import division, print_function, absolute_import, \
-    unicode_literals
+from __future__ import division, print_function, absolute_import
 
 # coding=utf-8
 

scripts/basic-test.sh

@@ -27,6 +27,11 @@ if [ "$DARWIN" != true ]; then
   done
 fi
 
+pushd hypothesis-extra/hypothesis-pytest
+    python setup.py install
+    python -m pytest tests/
+popd
+
 pip install .[datetime]
 python -m pytest tests/datetime/
 pip uninstall -y pytz

scripts/lint.sh

@@ -6,8 +6,8 @@ export LC_ALL=en_GB.UTF-8
 
 python scripts/enforce_header.py
 isort -p hypothesis -ls -m 2 -w 75 \
-    -a  "from __future__ import absolute_import, print_function, unicode_literals, division" \
+    -a  "from __future__ import absolute_import, print_function, division" \
     -rc src tests examples hypothesis-extra/*/{src,tests}
 find hypothesis-extra/*/{src,tests} src tests examples -name '*.py' | xargs pyformat -i
 git diff --exit-code
-flake8 src tests --exclude=compat.py,test_reflection.py,tests/py2 --ignore=E731,E721
+flake8 src tests --exclude=compat.py,test_reflection.py,test_imports.py,tests/py2 --ignore=E731,E721

src/hypothesis/__init__.py

@@ -22,8 +22,6 @@
 
 """
 
-from __future__ import division, print_function, absolute_import, \
-    unicode_literals
 
 from hypothesis.searchstrategy import strategy
 from hypothesis.settings import Settings, Verbosity

src/hypothesis/control.py

@@ -14,8 +14,7 @@
 
 # END HEADER
 
-from __future__ import division, print_function, absolute_import, \
-    unicode_literals
+from __future__ import division, print_function, absolute_import
 
 import traceback
 
@@ -77,5 +76,5 @@ def cleanup(teardown):
     context = _current_build_context.value
     if context is None:
         raise InvalidArgument(
-            'Cannot register cleanup outside of build context')
+            u'Cannot register cleanup outside of build context')
     context.tasks.append(teardown)