aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Gareth Coles <[email protected]>2018-03-27 12:37:02 +0100
committerGravatar Gareth Coles <[email protected]>2018-03-27 12:37:02 +0100
commitf6951062a2943c2a30f96f2f059b972d6ec3e1c8 (patch)
treefc22e5e846165243eca020305e8a01b4ab71541b
parentUpdate tox.ini (diff)
Change to "pycharm" style for import ordering
-rw-r--r--bot/__init__.py2
-rw-r--r--bot/__main__.py1
-rw-r--r--bot/cogs/bot.py9
-rw-r--r--bot/cogs/clickup.py1
-rw-r--r--bot/cogs/math.py1
-rw-r--r--bot/cogs/tags.py3
-rw-r--r--deploy.py1
-rw-r--r--tox.ini1
8 files changed, 7 insertions, 12 deletions
diff --git a/bot/__init__.py b/bot/__init__.py
index 289564ee7..df76215e6 100644
--- a/bot/__init__.py
+++ b/bot/__init__.py
@@ -6,12 +6,10 @@ from logging import Logger, StreamHandler
from logging.handlers import SysLogHandler
import discord.ext.commands.view
-
from logmatic import JsonFormatter
from bot.constants import PAPERTRAIL_ADDRESS, PAPERTRAIL_PORT
-
logging.TRACE = 5
logging.addLevelName(logging.TRACE, "TRACE")
diff --git a/bot/__main__.py b/bot/__main__.py
index bae090cd3..f23b50975 100644
--- a/bot/__main__.py
+++ b/bot/__main__.py
@@ -2,7 +2,6 @@
import os
from aiohttp import AsyncResolver, ClientSession, TCPConnector
-
from discord import Game
from discord.ext.commands import AutoShardedBot, when_mentioned_or
diff --git a/bot/cogs/bot.py b/bot/cogs/bot.py
index f4f91ce33..3b2ff0926 100644
--- a/bot/cogs/bot.py
+++ b/bot/cogs/bot.py
@@ -6,12 +6,13 @@ import time
from discord import Embed, Message
from discord.ext.commands import AutoShardedBot, Context, command, group
-
from dulwich.repo import Repo
-from bot.constants import (BOT_CHANNEL, DEVTEST_CHANNEL, HELP1_CHANNEL,
- HELP2_CHANNEL, HELP3_CHANNEL, PYTHON_CHANNEL,
- PYTHON_GUILD, VERIFIED_ROLE)
+from bot.constants import (
+ BOT_CHANNEL, DEVTEST_CHANNEL, HELP1_CHANNEL,
+ HELP2_CHANNEL, HELP3_CHANNEL, PYTHON_CHANNEL,
+ PYTHON_GUILD, VERIFIED_ROLE
+)
from bot.decorators import with_role
log = logging.getLogger(__name__)
diff --git a/bot/cogs/clickup.py b/bot/cogs/clickup.py
index 12572fd6a..f52402d93 100644
--- a/bot/cogs/clickup.py
+++ b/bot/cogs/clickup.py
@@ -3,7 +3,6 @@ import logging
from discord import Colour, Embed
from discord.ext.commands import AutoShardedBot, Context, command
-
from multidict import MultiDict
from bot.constants import (
diff --git a/bot/cogs/math.py b/bot/cogs/math.py
index 649cf4915..5fd8433c5 100644
--- a/bot/cogs/math.py
+++ b/bot/cogs/math.py
@@ -11,7 +11,6 @@ from subprocess import PIPE, Popen, STDOUT, TimeoutExpired # noqa: B404
from discord import File
from discord.ext.commands import command
-
LATEX_URL = "https://latex2png.com"
diff --git a/bot/cogs/tags.py b/bot/cogs/tags.py
index 5d7d26394..e4719e124 100644
--- a/bot/cogs/tags.py
+++ b/bot/cogs/tags.py
@@ -4,8 +4,7 @@ import time
from discord import Colour, Embed
from discord.ext.commands import AutoShardedBot, Context, command
-from bot.constants import ADMIN_ROLE, MODERATOR_ROLE, OWNER_ROLE
-from bot.constants import SITE_API_KEY, SITE_API_TAGS_URL, TAG_COOLDOWN
+from bot.constants import ADMIN_ROLE, MODERATOR_ROLE, OWNER_ROLE, SITE_API_KEY, SITE_API_TAGS_URL, TAG_COOLDOWN
from bot.decorators import with_role
from bot.pagination import LinePaginator
diff --git a/deploy.py b/deploy.py
index 1f0ca19ca..853d2b0c5 100644
--- a/deploy.py
+++ b/deploy.py
@@ -2,7 +2,6 @@ import os
import requests
-
branch = os.environ.get("TRAVIS_BRANCH")
url = os.environ.get("AUTODEPLOY_WEBHOOK")
token = os.environ.get("AUTODEPLOY_TOKEN")
diff --git a/tox.ini b/tox.ini
index c9de86ca5..a8869d3ba 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,3 +3,4 @@ max-line-length=120
application_import_names=bot
exclude=.venv
ignore=B311,W503,E226
+import-order-style=pycharm