[WIP] add isort to CI

matrix_client/api.py

@@ -16,12 +16,14 @@
 
 import json
 import warnings
-from requests import Session, RequestException
-from time import time, sleep
-from .__init__ import __version__
-from .errors import MatrixError, MatrixRequestError, MatrixHttpLibError
-from urllib3.util import parse_url
+from time import sleep, time
+
+from requests import RequestException, Session
 from urllib3.exceptions import LocationParseError
+from urllib3.util import parse_url
+
+from .__init__ import __version__
+from .errors import MatrixError, MatrixHttpLibError, MatrixRequestError
 
 try:
     from urllib import quote

matrix_client/client.py

@@ -12,21 +12,23 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+import logging
+import sys
+from threading import Thread
+from time import sleep
+from uuid import uuid4
+from warnings import warn
+
 from .api import MatrixHttpApi
 from .errors import MatrixRequestError, MatrixUnexpectedResponse
 from .room import Room
 from .user import User
+
 try:
     from .crypto.olm_device import OlmDevice
     ENCRYPTION_SUPPORT = True
 except ImportError:
     ENCRYPTION_SUPPORT = False
-from threading import Thread
-from time import sleep
-from uuid import uuid4
-from warnings import warn
-import logging
-import sys
 
 logger = logging.getLogger(__name__)
 

matrix_client/room.py

@@ -17,8 +17,8 @@
 from uuid import uuid4
 
 from .checks import check_room_id
-from .user import User
 from .errors import MatrixRequestError
+from .user import User
 
 
 class Room(object):

samples/ChangeDisplayName.py

@@ -9,12 +9,12 @@
 # 11 - Serverside Error
 
 import sys
-import samples_common
 
-from matrix_client.client import MatrixClient
-from matrix_client.api import MatrixRequestError
+import samples_common
 from requests.exceptions import MissingSchema
 
+from matrix_client.api import MatrixRequestError
+from matrix_client.client import MatrixClient
 
 host, username, password = samples_common.get_user_details(sys.argv)
 

samples/GetUserProfile.py

@@ -9,11 +9,12 @@
 
 
 import sys
+
 import samples_common  # Common bits used between samples
+from requests.exceptions import MissingSchema
 
-from matrix_client.client import MatrixClient
 from matrix_client.api import MatrixRequestError
-from requests.exceptions import MissingSchema
+from matrix_client.client import MatrixClient
 
 host, username, password = samples_common.get_user_details(sys.argv)
 

samples/SetRoomProfile.py

@@ -9,12 +9,12 @@
 # 11 - Serverside Error
 
 import sys
-import samples_common
 
-from matrix_client.client import MatrixClient
-from matrix_client.api import MatrixRequestError
+import samples_common
 from requests.exceptions import MissingSchema
 
+from matrix_client.api import MatrixRequestError
+from matrix_client.client import MatrixClient
 
 host, username, password = samples_common.get_user_details(sys.argv)
 

samples/SimpleChatClient.py

@@ -11,13 +11,14 @@
 # 11 - Wrong room format.
 # 12 - Couldn't find room.
 
+import logging
 import sys
+
 import samples_common  # Common bits used between samples
-import logging
+from requests.exceptions import MissingSchema
 
-from matrix_client.client import MatrixClient
 from matrix_client.api import MatrixRequestError
-from requests.exceptions import MissingSchema
+from matrix_client.client import MatrixClient
 
 
 # Called when a message is recieved.

samples/UserPassOrTokenClient.py

@@ -16,9 +16,11 @@
 """
 
 import argparse
-from matrix_client.client import MatrixClient
+
+from requests.exceptions import InvalidSchema, MissingSchema
+
 from matrix_client.api import MatrixRequestError
-from requests.exceptions import MissingSchema, InvalidSchema
+from matrix_client.client import MatrixClient
 
 
 def example(host, user, password, token):

setup.cfg

@@ -14,4 +14,15 @@ addopts = test/
 universal = 1
 
 [metadata]
-license_file = LICENSE
+license_file = LICENSE
+
+[isort]
+line_length = 89
+not_skip = __init__.py
+sections=FUTURE,STDLIB,COMPAT,THIRDPARTY,TWISTED,FIRSTPARTY,TESTS,LOCALFOLDER
+default_section=THIRDPARTY
+known_first_party = matrix_client
+known_tests=tests
+multi_line_output=3
+include_trailing_comma=true
+combine_as_imports=true

test/api_test.py

@@ -1,11 +1,14 @@
-import responses
-import pytest
 import json
 from copy import deepcopy
-from matrix_client import client, api
-from matrix_client.errors import MatrixRequestError, MatrixError, MatrixHttpLibError
-from matrix_client import __version__ as lib_version
+
+import pytest
+import responses
+
+from matrix_client import __version__ as lib_version, api, client
+from matrix_client.errors import MatrixError, MatrixHttpLibError, MatrixRequestError
+
 from . import response_examples
+
 MATRIX_V2_API_PATH = "/_matrix/client/r0"
 
 

test/client_test.py

@@ -1,10 +1,14 @@
-import pytest
-import responses
 import json
 from copy import deepcopy
-from matrix_client.client import MatrixClient, Room, User, CACHE
+
+import pytest
+import responses
+
 from matrix_client.api import MATRIX_V2_API_PATH
+from matrix_client.client import CACHE, MatrixClient, Room, User
+
 from . import response_examples
+
 try:
     from urllib import quote
 except ImportError:

test/crypto/olm_device_test.py

@@ -1,15 +1,15 @@
-import pytest
-pytest.importorskip("olm")  # noqa
-
 import json
 from copy import deepcopy
+from test.response_examples import example_key_upload_response
 
+import pytest
 import responses
 
 from matrix_client.api import MATRIX_V2_API_PATH
 from matrix_client.client import MatrixClient
 from matrix_client.crypto.olm_device import OlmDevice
-from test.response_examples import example_key_upload_response
+
+pytest.importorskip("olm")  # noqa
 
 HOSTNAME = 'http://example.com'
 

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py34,py35,py36,packaging,pep8,docs
+envlist = py27,py34,py35,py36,packaging,pep8,docs,check_isort
 
 [testenv]
 passenv = TRAVIS TRAVIS_*
@@ -33,6 +33,11 @@ deps = .[doc]
 changedir = docs
 commands = sphinx-build -W source build/html
 
+[testenv:check_isort]
+skip_install = True
+deps = isort
+commands = /bin/sh -c "isort -c -sp setup.cfg -rc matrix_client samples test"
+
 [travis]
 python =
     2.7: py27