Run make format with latest version

tests/conftest.py

@@ -4,12 +4,13 @@
 
 import pytest
 import requests
+from pytest_mock.plugin import MockerFixture
+
 from kinto_http import AsyncClient, Client
 from kinto_http.constants import DEFAULT_AUTH, SERVER_URL, USER_AGENT
 from kinto_http.endpoints import Endpoints
 from kinto_http.exceptions import KintoException
 from kinto_http.session import Session
-from pytest_mock.plugin import MockerFixture
 
 from .support import create_user, get_200, get_503, mock_response
 

tests/support.py

@@ -5,6 +5,7 @@
 from urllib.parse import urljoin
 
 import requests
+
 from kinto_http.constants import DEFAULT_AUTH
 from kinto_http.exceptions import KintoException
 

tests/test_async_client.py

@@ -1,12 +1,13 @@
 import re
 
 import pytest
+from pytest_mock import MockerFixture
+
 from kinto_http import AsyncClient as Client
 from kinto_http import BearerTokenAuth, BucketNotFound, KintoException
 from kinto_http.constants import DO_NOT_OVERWRITE, SERVER_URL
 from kinto_http.patch_type import JSONPatch, MergePatch
 from kinto_http.session import create_session
-from pytest_mock import MockerFixture
 
 from .support import build_response, get_http_error, mock_response
 

tests/test_batch.py

@@ -1,8 +1,9 @@
 import pytest
+from pytest_mock.plugin import MockerFixture
+
 from kinto_http import Client
 from kinto_http.batch import BatchSession
 from kinto_http.exceptions import KintoException
-from pytest_mock.plugin import MockerFixture
 
 
 def test_requests_are_stacked(batch_setup: Client, mocker: MockerFixture):

tests/test_cli_utils.py

@@ -1,8 +1,9 @@
 import argparse
 
+from pytest_mock import MockerFixture
+
 from kinto_http import BearerTokenAuth, cli_utils
 from kinto_http.constants import ALL_PARAMETERS
-from pytest_mock import MockerFixture
 
 from .support import assert_option_strings
 

tests/test_client.py

@@ -1,6 +1,8 @@
 import re
 
 import pytest
+from pytest_mock.plugin import MockerFixture
+
 from kinto_http import (
     BearerTokenAuth,
     BucketNotFound,
@@ -11,7 +13,6 @@
 )
 from kinto_http.constants import DO_NOT_OVERWRITE, SERVER_URL
 from kinto_http.patch_type import JSONPatch, MergePatch
-from pytest_mock.plugin import MockerFixture
 
 from .support import build_response, get_http_error, mock_response
 

tests/test_endpoints.py

@@ -1,6 +1,7 @@
 from typing import Dict, Tuple
 
 import pytest
+
 from kinto_http import KintoException
 from kinto_http.endpoints import Endpoints
 

tests/test_functional.py

@@ -2,6 +2,7 @@
 from unittest import mock
 
 import pytest
+
 from kinto_http import BucketNotFound, CollectionNotFound, KintoException, replication
 from kinto_http.patch_type import JSONPatch
 

tests/test_functional_async.py

@@ -1,7 +1,8 @@
 import pytest
+from pytest_mock import MockerFixture
+
 from kinto_http import BucketNotFound, CollectionNotFound, KintoException
 from kinto_http.patch_type import JSONPatch
-from pytest_mock import MockerFixture
 
 from .support import get_user_id
 

tests/test_logging.py

@@ -1,6 +1,7 @@
-from kinto_http import Client
 from pytest_mock.plugin import MockerFixture
 
+from kinto_http import Client
+
 
 def test_create_bucket_logs_info_message(client_setup: Client, mocker: MockerFixture):
     mocked_logger = mocker.patch("kinto_http.client.logger")

tests/test_replication.py

@@ -1,6 +1,7 @@
+from pytest_mock import MockerFixture
+
 from kinto_http import Client, exceptions
 from kinto_http.replication import replicate
-from pytest_mock import MockerFixture
 
 from .support import mock_response
 

tests/test_session.py

@@ -5,13 +5,14 @@
 from typing import Tuple
 from unittest.mock import MagicMock
 
-import kinto_http
 import pkg_resources
 import pytest
+from pytest_mock.plugin import MockerFixture
+
+import kinto_http
 from kinto_http.constants import USER_AGENT
 from kinto_http.exceptions import BackoffException, KintoException
 from kinto_http.session import Session, create_session
-from pytest_mock.plugin import MockerFixture
 
 from .support import get_200, get_403, get_503, get_http_response