From a12bc416ed37c856f85f3718aa0ec9b6ab35fa52 Mon Sep 17 00:00:00 2001
From: matejcik <ja@matejcik.cz>
Date: Tue, 15 Aug 2023 17:45:13 +0200
Subject: [PATCH] chore: upgrade to isort 5

---
 poetry.lock    | 18 +++++++++---------
 pyproject.toml | 20 +++++++++++++++++++-
 setup.cfg      | 11 -----------
 3 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 7c9f41fba..05a006ea2 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -658,20 +658,20 @@ nose = "*"
 
 [[package]]
 name = "isort"
-version = "4.3.21"
+version = "5.11.5"
 description = "A Python utility / library to sort Python imports."
 optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+python-versions = ">=3.7.0"
 files = [
-    {file = "isort-4.3.21-py2.py3-none-any.whl", hash = "sha256:6e811fcb295968434526407adb8796944f1988c5b65e8139058f2014cbe100fd"},
-    {file = "isort-4.3.21.tar.gz", hash = "sha256:54da7e92468955c4fceacd0c86bd0ec997b0e1ee80d97f67c35a78b719dccab1"},
+    {file = "isort-5.11.5-py3-none-any.whl", hash = "sha256:ba1d72fb2595a01c7895a5128f9585a5cc4b6d395f1c8d514989b9a7eb2a8746"},
+    {file = "isort-5.11.5.tar.gz", hash = "sha256:6be1f76a507cb2ecf16c7cf14a37e41609ca082330be4e3436a18ef74add55db"},
 ]
 
 [package.extras]
-pipfile = ["pipreqs", "requirementslib"]
-pyproject = ["toml"]
-requirements = ["pip-api", "pipreqs"]
-xdg-home = ["appdirs (>=1.4.0)"]
+colors = ["colorama (>=0.4.3,<0.5.0)"]
+pipfile-deprecated-finder = ["pip-shims (>=0.5.2)", "pipreqs", "requirementslib"]
+plugins = ["setuptools"]
+requirements-deprecated-finder = ["pip-api", "pipreqs"]
 
 [[package]]
 name = "jinja2"
@@ -1794,4 +1794,4 @@ testing = ["func-timeout", "jaraco.itertools", "pytest (>=6)", "pytest-black (>=
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.7"
-content-hash = "40852ed8dec342c2386342584a7bd656d2e45bade0e78a15a17bf4b7b62240af"
+content-hash = "3645beabb81816a50198685957d9e8435c561f8a06256d0ed3f67599919e3d6c"
diff --git a/pyproject.toml b/pyproject.toml
index c7fdb97fa..698bb75bc 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -36,7 +36,7 @@ python-bitcoinlib = "^0.11.0"
 typing-extensions = ">=3.7.4"
 
 ## style
-isort = "<5"  # 5 changes lots of stuff that need to be addressed first: https://timothycrosley.github.io/isort/docs/upgrade_guides/5.0.0/
+isort = "^5"
 flake8 = ">=3.7.0"
 black = ">=22.3"
 mako = "^1.0.7"
@@ -84,3 +84,21 @@ towncrier = "^23.6.0"
 [build-system]
 requires = ["poetry>=1;<1.1", "pip>=20"]
 build-backend = "poetry.masonry.api"
+
+[tool.isort]
+profile = "black"
+extra_standard_library = [
+  "micropython",
+  "ubinascii",
+  "ustruct",
+  "uctypes",
+  "utime",
+  "utimeq",
+  "trezorio",
+  "trezorui",
+  "trezorutils",
+  "trezorconfig",
+  "trezorcrypto",
+]
+known_first_party = ["trezorlib", "apps", "coin_info", "marketcap", "ui_tests", "gitlab"]
+known_third_party = ["trezor", "storage"]
diff --git a/setup.cfg b/setup.cfg
index 5e6780099..93e3e9360 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,17 +19,6 @@ ignore =
 per-file-ignores =
     core/mocks/generated/*:F4
 
-[isort]
-multi_line_output = 3
-include_trailing_comma = True
-force_grid_wrap = 0
-combine_as_imports = True
-line_length = 88
-not_skip=__init__.py
-known_standard_library = micropython,ubinascii,ustruct,uctypes,utime,utimeq,trezorio,trezorui,trezorutils,trezorconfig,trezorcrypto
-known_third_party = curve25519,ecdsa,hypothesis,pytest,mnemonic,shamir-mnemonic,trezor,storage,protobuf
-known_first_party = trezorlib,apps
-
 [tool:pytest]
 addopts = -rfE --strict-markers --random-order
 testpaths = tests crypto storage python/tests