diff --git a/contrib/buildbot/.isort.cfg b/contrib/buildbot/.isort.cfg
new file mode 100644
--- /dev/null
+++ b/contrib/buildbot/.isort.cfg
@@ -0,0 +1,2 @@
+[settings]
+known_first_party=build, server
diff --git a/contrib/buildbot/abcbot.py b/contrib/buildbot/abcbot.py
--- a/contrib/buildbot/abcbot.py
+++ b/contrib/buildbot/abcbot.py
@@ -11,8 +11,9 @@
 import sys
 from logging.handlers import RotatingFileHandler
 
-import server
 import slack
+
+import server
 from cirrus import Cirrus
 from phabricator_wrapper import PhabWrapper
 from slackbot import SlackBot
diff --git a/contrib/buildbot/cirrus.py b/contrib/buildbot/cirrus.py
--- a/contrib/buildbot/cirrus.py
+++ b/contrib/buildbot/cirrus.py
@@ -7,6 +7,7 @@
 import json
 
 import requests
+
 from build import BuildStatus
 
 BITCOIN_ABC_SECP256K1_REPO_ID = "6034374039699456"
diff --git a/contrib/buildbot/phabricator_wrapper.py b/contrib/buildbot/phabricator_wrapper.py
--- a/contrib/buildbot/phabricator_wrapper.py
+++ b/contrib/buildbot/phabricator_wrapper.py
@@ -8,9 +8,10 @@
 import os
 from base64 import b64decode
 
+from phabricator import Phabricator
+
 from build import BuildStatus
 from constants import Deployment
-from phabricator import Phabricator
 
 BUILDNAME_IGNORE_KEYWORD = "__BOTIGNORE"
 BITCOIN_ABC_PROJECT_PHID = "PHID-PROJ-z2wrchs62yicqvwlgc5r"
diff --git a/contrib/buildbot/server.py b/contrib/buildbot/server.py
--- a/contrib/buildbot/server.py
+++ b/contrib/buildbot/server.py
@@ -15,9 +15,10 @@
 from shlex import quote
 
 import yaml
-from build import BuildStatus, BuildTarget
 from deepmerge import always_merger
 from flask import Flask, abort, request
+
+from build import BuildStatus, BuildTarget
 from phabricator_wrapper import BITCOIN_ABC_PROJECT_PHID
 from shieldio import RasterBadge
 from teamcity_wrapper import TeamcityRequestException
diff --git a/contrib/buildbot/test/mocks/phabricator.py b/contrib/buildbot/test/mocks/phabricator.py
--- a/contrib/buildbot/test/mocks/phabricator.py
+++ b/contrib/buildbot/test/mocks/phabricator.py
@@ -5,6 +5,7 @@
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 import mock
+
 from phabricator_wrapper import PhabWrapper
 
 
diff --git a/contrib/buildbot/test/mocks/slackbot.py b/contrib/buildbot/test/mocks/slackbot.py
--- a/contrib/buildbot/test/mocks/slackbot.py
+++ b/contrib/buildbot/test/mocks/slackbot.py
@@ -5,6 +5,7 @@
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 import mock
+
 from slackbot import SlackBot
 
 
diff --git a/contrib/buildbot/test/mocks/teamcity.py b/contrib/buildbot/test/mocks/teamcity.py
--- a/contrib/buildbot/test/mocks/teamcity.py
+++ b/contrib/buildbot/test/mocks/teamcity.py
@@ -8,6 +8,7 @@
 
 import mock
 import requests
+
 from teamcity_wrapper import TeamCity
 
 TEAMCITY_BASE_URL = "https://teamcity.test"
diff --git a/contrib/buildbot/test/test_endpoint_build.py b/contrib/buildbot/test/test_endpoint_build.py
--- a/contrib/buildbot/test/test_endpoint_build.py
+++ b/contrib/buildbot/test/test_endpoint_build.py
@@ -10,6 +10,7 @@
 from test.abcbot_fixture import ABCBotFixture
 
 import requests
+
 from testutil import AnyWith
 
 
diff --git a/contrib/buildbot/test/test_endpoint_buildDiff.py b/contrib/buildbot/test/test_endpoint_buildDiff.py
--- a/contrib/buildbot/test/test_endpoint_buildDiff.py
+++ b/contrib/buildbot/test/test_endpoint_buildDiff.py
@@ -13,6 +13,7 @@
 
 import mock
 import requests
+
 from build import Build, BuildStatus
 from testutil import AnyWith
 
diff --git a/contrib/buildbot/test/test_endpoint_land.py b/contrib/buildbot/test/test_endpoint_land.py
--- a/contrib/buildbot/test/test_endpoint_land.py
+++ b/contrib/buildbot/test/test_endpoint_land.py
@@ -11,6 +11,7 @@
 from test.abcbot_fixture import ABCBotFixture
 
 import requests
+
 from testutil import AnyWith
 
 
diff --git a/contrib/buildbot/test/test_endpoint_status.py b/contrib/buildbot/test/test_endpoint_status.py
--- a/contrib/buildbot/test/test_endpoint_status.py
+++ b/contrib/buildbot/test/test_endpoint_status.py
@@ -15,6 +15,7 @@
 
 import mock
 import requests
+
 from build import BuildStatus
 from phabricator_wrapper import BITCOIN_ABC_REPO
 from server import BADGE_TC_BASE
diff --git a/contrib/buildbot/test/test_endpoint_triggerCI.py b/contrib/buildbot/test/test_endpoint_triggerCI.py
--- a/contrib/buildbot/test/test_endpoint_triggerCI.py
+++ b/contrib/buildbot/test/test_endpoint_triggerCI.py
@@ -13,6 +13,7 @@
 from unittest.mock import call
 
 import mock
+
 from phabricator_wrapper import BITCOIN_ABC_PROJECT_PHID
 
 
diff --git a/contrib/buildbot/test/test_persist_database.py b/contrib/buildbot/test/test_persist_database.py
--- a/contrib/buildbot/test/test_persist_database.py
+++ b/contrib/buildbot/test/test_persist_database.py
@@ -15,6 +15,7 @@
 from test.test_endpoint_status import statusRequestData
 
 import mock
+
 import server
 from build import BuildStatus
 from teamcity_wrapper import BuildInfo
diff --git a/contrib/buildbot/test/test_phabricator.py b/contrib/buildbot/test/test_phabricator.py
--- a/contrib/buildbot/test/test_phabricator.py
+++ b/contrib/buildbot/test/test_phabricator.py
@@ -10,6 +10,7 @@
 from base64 import b64encode
 
 import mock
+
 from build import BuildStatus, BuildTarget
 from phabricator_wrapper import BITCOIN_ABC_PROJECT_PHID, BITCOIN_ABC_REPO
 
diff --git a/contrib/buildbot/test/test_slackbot.py b/contrib/buildbot/test/test_slackbot.py
--- a/contrib/buildbot/test/test_slackbot.py
+++ b/contrib/buildbot/test/test_slackbot.py
@@ -8,6 +8,7 @@
 import unittest
 
 import mock
+
 from slackbot import SlackBot
 
 
diff --git a/contrib/buildbot/test/test_teamcity.py b/contrib/buildbot/test/test_teamcity.py
--- a/contrib/buildbot/test/test_teamcity.py
+++ b/contrib/buildbot/test/test_teamcity.py
@@ -12,6 +12,7 @@
 
 import mock
 import requests
+
 from teamcity_wrapper import TeamcityRequestException
 from testutil import AnyWith