Merge pull request #2489 from HypothesisWorks/pyup-scheduled-update-2020-07-13

Scheduled weekly dependency update for week 28

Author: DRMacIver

.isort.cfg

@@ -1,8 +1,4 @@
 [settings]
-default_section = THIRDPARTY
 known_first_party = hypothesis, hypothesistooling, tests
-multi_line_output = 3
-include_trailing_comma = True
-force_grid_wrap = 0
+profile = black
 combine_as_imports = True
-line_length = 88

hypothesis-python/RELEASE.rst

@@ -0,0 +1,4 @@
+RELEASE_TYPE: patch
+
+This patch updates our formatting to use :pypi:`isort` 5.
+There is no user-visible change.

hypothesis-python/examples/test_binary_search.py

@@ -23,8 +23,7 @@
 should change (or not) in response to movements in the underlying data.
 """
 
-import hypothesis.strategies as st
-from hypothesis import given
+from hypothesis import given, strategies as st
 
 
 def binary_search(ls, v):

hypothesis-python/examples/test_rle.py

@@ -27,8 +27,7 @@
 underlying data.
 """
 
-import hypothesis.strategies as st
-from hypothesis import assume, given
+from hypothesis import assume, given, strategies as st
 
 
 def run_length_encode(seq):

hypothesis-python/src/hypothesis/core.py

@@ -34,7 +34,7 @@
 
 import attr
 
-import hypothesis.strategies as st
+from hypothesis import strategies as st
 from hypothesis._settings import (
  HealthCheck,
  Phase,

hypothesis-python/src/hypothesis/extra/dateutil.py

@@ -28,7 +28,7 @@
 
 from dateutil import tz, zoneinfo # type: ignore
 
-import hypothesis.strategies._internal.core as st
+from hypothesis.strategies._internal import core as st
 
 __all__ = ["timezones"]
 

hypothesis-python/src/hypothesis/extra/django/_fields.py

@@ -20,15 +20,15 @@
 from typing import Any, Callable, Dict, Type, TypeVar, Union
 
 import django
-import django.db.models as dm
-import django.forms as df
+from django import forms as df
 from django.core.validators import (
  validate_ipv4_address,
  validate_ipv6_address,
  validate_ipv46_address,
 )
+from django.db import models as dm
 
-import hypothesis.strategies as st
+from hypothesis import strategies as st
 from hypothesis.errors import InvalidArgument
 from hypothesis.extra.pytz import timezones
 from hypothesis.internal.validation import check_type

hypothesis-python/src/hypothesis/extra/django/_impl.py

@@ -19,17 +19,15 @@
 from inspect import Parameter, signature
 from typing import Type, Union
 
-import django.db.models as dm
-import django.forms as df
-import django.test as dt
+from django import forms as df, test as dt
 from django.core.exceptions import ValidationError
-from django.db import IntegrityError
+from django.db import IntegrityError, models as dm
 
-import hypothesis.strategies._internal.core as st
 from hypothesis import reject
 from hypothesis._settings import note_deprecation
 from hypothesis.errors import InvalidArgument
 from hypothesis.extra.django._fields import from_field
+from hypothesis.strategies._internal import core as st
 from hypothesis.utils.conventions import InferType, infer
 
 

hypothesis-python/src/hypothesis/extra/lark.py

@@ -41,12 +41,11 @@
 import lark
 from lark.grammar import NonTerminal, Terminal
 
-import hypothesis.strategies._internal.core as st
 from hypothesis.errors import InvalidArgument
 from hypothesis.internal.conjecture.utils import calc_label_from_name
 from hypothesis.internal.reflection import deprecated_posargs
 from hypothesis.internal.validation import check_type
-from hypothesis.strategies._internal import SearchStrategy
+from hypothesis.strategies._internal import SearchStrategy, core as st
 
 __all__ = ["from_lark"]
 

hypothesis-python/src/hypothesis/extra/numpy.py

@@ -19,14 +19,13 @@
 
 import numpy as np
 
-import hypothesis.internal.conjecture.utils as cu
-import hypothesis.strategies._internal.core as st
 from hypothesis import assume
 from hypothesis.errors import InvalidArgument
+from hypothesis.internal.conjecture import utils as cu
 from hypothesis.internal.coverage import check_function
 from hypothesis.internal.reflection import deprecated_posargs, proxies
 from hypothesis.internal.validation import check_type, check_valid_interval
-from hypothesis.strategies._internal import SearchStrategy, check_strategy
+from hypothesis.strategies._internal import SearchStrategy, check_strategy, core as st
 from hypothesis.strategies._internal.strategies import T
 from hypothesis.utils.conventions import UniqueIdentifier, not_set