lint: Use isort for py files.

Author: PIG208

pyproject.toml

@@ -0,0 +1,5 @@
+[tool.isort]
+src_paths = [".", "tools"]
+known_third_party = "zulip"
+profile = "black"
+line_length = 100

requirements.txt

@@ -1,6 +1,7 @@
 crayons
 twine
 coverage>=4.4.1
+isort
 flake8
 mock
 pytest

tools/custom_check.py

@@ -1,4 +1,5 @@
 from typing import List
+
 from zulint.custom_rules import RuleList
 
 MYPY = False

tools/deploy

@@ -1,14 +1,14 @@
 #!/usr/bin/env python3
 
-from typing import Any, List, Dict, Callable
-
+import argparse
 import os
 import sys
-import argparse
-import zipfile
 import textwrap
-import requests
 import urllib.parse
+import zipfile
+from typing import Any, Callable, Dict, List
+
+import requests
 from requests import Response
 
 red = '\033[91m'  # type: str

tools/lint

@@ -3,9 +3,9 @@
 import argparse
 import sys
 
-from zulint.command import add_default_linter_arguments, LinterConfig
+from zulint.command import LinterConfig, add_default_linter_arguments
 
-from custom_check import python_rules, non_py_rules
+from custom_check import non_py_rules, python_rules
 
 EXCLUDED_FILES = [
     # This is an external file that doesn't comply with our codestyle
@@ -28,6 +28,9 @@ def run() -> None:
                                   description="Standard Python linter (config: .flake8)")
     linter_config.external_linter('gitlint', ['tools/lint-commits'],
                                   description="Git Lint for commit messages")
+    linter_config.external_linter("isort", ["isort"], ["py"],
+                                  description="Sorts Python import statements",
+                                  check_arg=["--check-only", "--diff"])
 
     @linter_config.lint
     def custom_py() -> int:

tools/provision

@@ -1,10 +1,10 @@
 #!/usr/bin/env python3
 
-import os
-import sys
 import argparse
-import subprocess
 import glob
+import os
+import subprocess
+import sys
 
 CURRENT_DIR = os.path.dirname(os.path.abspath(__file__))
 ZULIP_BOTS_DIR = os.path.join(CURRENT_DIR, '..', 'zulip_bots')

tools/release-packages

@@ -1,15 +1,15 @@
 #!/usr/bin/env python3
 
-from contextlib import contextmanager
-import os
 import argparse
 import glob
+import os
 import shutil
 import tempfile
+from contextlib import contextmanager
 
 import crayons
-import twine.commands.upload
 import setuptools.sandbox
+import twine.commands.upload
 
 REPO_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 

tools/review

@@ -3,6 +3,7 @@
 import subprocess
 import sys
 
+
 def exit(message: str) -> None:
     print('PROBLEM!')
     print(message)

tools/run-mypy

@@ -1,14 +1,14 @@
 #!/usr/bin/env python3
 
-import os
-import sys
 import argparse
+import os
 import subprocess
-
+import sys
 from collections import OrderedDict
 from pathlib import PurePath
+from typing import Dict, List, cast
+
 from zulint import lister
-from typing import cast, Dict, List
 
 TOOLS_DIR = os.path.dirname(os.path.abspath(__file__))
 os.chdir(os.path.dirname(TOOLS_DIR))

tools/server_lib/test_handler.py

@@ -1,10 +1,11 @@
 
+import argparse
 import os
+import shutil
 import sys
-import argparse
 import unittest
+
 import pytest
-import shutil
 
 TOOLS_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 os.chdir(os.path.dirname(TOOLS_DIR))