Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

check isort by travis #3540

Merged
merged 3 commits into from
Jul 17, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ matrix:
- python: 3.6
env: TOX_ENV=py36

- python: 3.6
env: TOX_ENV=check_isort

- python: 3.6
env: TOX_ENV=check-newsfragment

Expand Down
1 change: 1 addition & 0 deletions changelog.d/3540.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
check isort for each PR
2 changes: 1 addition & 1 deletion synapse/http/site.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

from synapse.http import redact_uri
from synapse.http.request_metrics import RequestMetrics
from synapse.util.logcontext import LoggingContext, ContextResourceUsage
from synapse.util.logcontext import ContextResourceUsage, LoggingContext

logger = logging.getLogger(__name__)

Expand Down
4 changes: 2 additions & 2 deletions synapse/rest/client/v1/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
from synapse.api.errors import AuthError, Codes, NotFoundError, SynapseError
from synapse.http.servlet import (
assert_params_in_dict,
parse_json_object_from_request,
parse_integer,
parse_string
parse_json_object_from_request,
parse_string,
)
from synapse.types import UserID, create_requester

Expand Down
2 changes: 1 addition & 1 deletion synapse/rest/client/v1/initial_sync.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@

from twisted.internet import defer

from synapse.streams.config import PaginationConfig
from synapse.http.servlet import parse_boolean
from synapse.streams.config import PaginationConfig

from .base import ClientV1RestServlet, client_path_patterns

Expand Down
2 changes: 1 addition & 1 deletion synapse/rest/client/v2_alpha/devices.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@

from synapse.api import errors
from synapse.http.servlet import (
RestServlet,
assert_params_in_dict,
parse_json_object_from_request,
RestServlet
)

from ._base import client_v2_patterns, interactive_auth_handler
Expand Down
4 changes: 2 additions & 2 deletions synapse/rest/media/v1/identicon_resource.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@

from pydenticon import Generator

from synapse.http.servlet import parse_integer

from twisted.web.resource import Resource

from synapse.http.servlet import parse_integer

FOREGROUND = [
"rgb(45,79,255)",
"rgb(254,180,44)",
Expand Down
8 changes: 6 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = packaging, py27, py36, pep8
envlist = packaging, py27, py36, pep8, check_isort

[testenv]
deps =
Expand Down Expand Up @@ -103,10 +103,14 @@ deps =
flake8
commands = /bin/sh -c "flake8 synapse tests {env:PEP8SUFFIX:}"

[testenv:check_isort]
skip_install = True
deps = isort
commands = /bin/sh -c "isort -c -sp setup.cfg -rc synapse tests"

[testenv:check-newsfragment]
skip_install = True
deps = towncrier>=18.6.0rc1
commands =
python -m towncrier.check --compare-with=origin/develop
basepython = python3.6
basepython = python3.6