Tue, 20 Dec 2022 17:49:16 +0100
Resorted imports with isort.
--- a/AssistantEric/APIsManager.py Thu Nov 17 18:00:18 2022 +0100 +++ b/AssistantEric/APIsManager.py Tue Dec 20 17:49:16 2022 +0100 @@ -10,17 +10,14 @@ import contextlib import os -from PyQt6.QtCore import QTimer, QThread, QFileInfo, pyqtSignal, QDateTime, QObject, Qt +from PyQt6.QtCore import QDateTime, QFileInfo, QObject, Qt, QThread, QTimer, pyqtSignal with contextlib.suppress(ImportError): from PyQt6.QtSql import QSqlDatabase, QSqlQuery from eric7 import Globals, Preferences, Utilities - from eric7.EricWidgets.EricApplication import ericApp - from eric7.QScintilla import Lexers - from eric7.Utilities import ModuleParser WorkerStatusStarted = 2001
--- a/AssistantEric/Assistant.py Thu Nov 17 18:00:18 2022 +0100 +++ b/AssistantEric/Assistant.py Tue Dec 20 17:49:16 2022 +0100 @@ -8,8 +8,8 @@ calltips system. """ +import imp import re -import imp from PyQt6.QtCore import QObject
--- a/AssistantEric/ConfigurationPages/AutoCompletionEricPage.py Thu Nov 17 18:00:18 2022 +0100 +++ b/AssistantEric/ConfigurationPages/AutoCompletionEricPage.py Tue Dec 20 17:49:16 2022 +0100 @@ -7,9 +7,10 @@ Module implementing the Eric Autocompletion configuration page. """ +from Preferences.ConfigurationPages.ConfigurationPageBase import ConfigurationPageBase + from AssistantEric.Assistant import AcsAPIs, AcsDocument, AcsProject -from Preferences.ConfigurationPages.ConfigurationPageBase import ConfigurationPageBase from .Ui_AutoCompletionEricPage import Ui_AutoCompletionEricPage
--- a/AssistantEric/ConfigurationPages/CallTipsEricPage.py Thu Nov 17 18:00:18 2022 +0100 +++ b/AssistantEric/ConfigurationPages/CallTipsEricPage.py Tue Dec 20 17:49:16 2022 +0100 @@ -8,6 +8,7 @@ """ from Preferences.ConfigurationPages.ConfigurationPageBase import ConfigurationPageBase + from .Ui_CallTipsEricPage import Ui_CallTipsEricPage
--- a/PluginAssistantEric.py Thu Nov 17 18:00:18 2022 +0100 +++ b/PluginAssistantEric.py Tue Dec 20 17:49:16 2022 +0100 @@ -9,13 +9,11 @@ import os -from PyQt6.QtCore import QObject, QTranslator, QCoreApplication - -from eric7.EricWidgets.EricApplication import ericApp - -from eric7 import Preferences +from PyQt6.QtCore import QCoreApplication, QObject, QTranslator from AssistantEric.Assistant import AcsAPIs, AcsProject +from eric7 import Preferences +from eric7.EricWidgets.EricApplication import ericApp # Start-Of-Header name = "Assistant Eric Plugin"
--- a/PluginEricAssistant.epj Thu Nov 17 18:00:18 2022 +0100 +++ b/PluginEricAssistant.epj Tue Dec 20 17:49:16 2022 +0100 @@ -191,7 +191,8 @@ "ChangeLog", "PKGLIST", "PluginAssistantEric.zip", - "PluginEricAssistant.epj" + "PluginEricAssistant.epj", + "pyproject.toml" ], "OTHERTOOLSPARMS": { "Black": { @@ -209,6 +210,23 @@ "py38", "py37" ] + }, + "isort": { + "combine_as_imports": true, + "config_source": "project", + "extend_skip_glob": [ + "*/Ui_*.py" + ], + "lines_between_types": 1, + "profile": "black", + "sort_order": "natural", + "supported_extensions": [ + "py", + "pyi", + "pyx", + "pxd", + "pyw" + ] } }, "PACKAGERSPARMS": {},
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pyproject.toml Tue Dec 20 17:49:16 2022 +0100 @@ -0,0 +1,10 @@ +[tool.isort] +profile = "black" +sort_order = "natural" +supported_extensions = ["py", "pyi", "pyx", "pxd", "pyw"] +lines_between_types = 1 +extend_skip_glob = [ + "*/Ui_*.py", +] +combine_as_imports = true +known_first_party = ["AssistantEric", "eric7"]