chore: Sort all Python source files with isort

Changelog: None

src/mender/bootstrap/bootstrap.py

@@ -16,8 +16,9 @@
 import os.path
 from typing import Optional
 
-from cryptography.hazmat.primitives.asymmetric.rsa import RSAPrivateKeyWithSerialization
 from cryptography.exceptions import UnsupportedAlgorithm
+from cryptography.hazmat.primitives.asymmetric.rsa import \
+    RSAPrivateKeyWithSerialization
 
 import mender.security.key as key
 

src/mender/client/authorize.py

@@ -14,9 +14,10 @@
 import json
 import logging as log
 from typing import Optional
-import requests
 
-from cryptography.hazmat.primitives.asymmetric.rsa import RSAPrivateKeyWithSerialization
+import requests
+from cryptography.hazmat.primitives.asymmetric.rsa import \
+    RSAPrivateKeyWithSerialization
 
 import mender.security.key as key
 

src/mender/client/deployments.py

@@ -12,16 +12,15 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 import logging as log
-from typing import Optional
-from typing import Dict
 import os.path
-import time
 import re
+import time
+from typing import Dict, Optional
 
 import requests
 
-import mender.settings.settings as settings
 import mender.log.log as menderlog
+import mender.settings.settings as settings
 from mender.client import HTTPUnathorized
 
 STATUS_SUCCESS = "success"

src/mender/client/inventory.py

@@ -13,6 +13,7 @@
 #    limitations under the License.
 import json
 import logging as log
+
 import requests
 
 

src/mender/mender.py

@@ -20,7 +20,6 @@
 import mender.client.deployments as deployments
 import mender.settings.settings as settings
 import mender.statemachine.statemachine as statemachine
-
 from mender._version import __version__ as package_version
 from mender.log.log import DeploymentLogHandler
 

src/mender/scripts/aggregator/aggregator.py

@@ -13,7 +13,6 @@
 #    limitations under the License.
 import logging as log
 import subprocess
-
 from typing import Dict, List
 
 

src/mender/scripts/aggregator/identity.py

@@ -12,8 +12,8 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-import os
 import logging as log
+import os
 
 from mender.scripts.aggregator.aggregator import ScriptKeyValueAggregator
 

src/mender/scripts/aggregator/inventory.py

@@ -17,9 +17,9 @@
 import os.path as path
 from typing import List
 
-from mender.scripts.aggregator.aggregator import ScriptKeyValueAggregator
 import mender.scripts.artifactinfo as artifactinfo
 import mender.scripts.devicetype as devicetype
+from mender.scripts.aggregator.aggregator import ScriptKeyValueAggregator
 
 
 def aggregate(script_path: str, device_type_path: str, artifact_info_path: str) -> dict:

src/mender/security/key.py

@@ -13,7 +13,8 @@
 #    limitations under the License.
 import logging as log
 
-from cryptography.hazmat.primitives.asymmetric.rsa import RSAPrivateKeyWithSerialization
+from cryptography.hazmat.primitives.asymmetric.rsa import \
+    RSAPrivateKeyWithSerialization
 
 import mender.security.rsa as rsa
 

src/mender/security/rsa.py

@@ -15,12 +15,10 @@
 import os
 
 from cryptography.hazmat.backends import default_backend
-from cryptography.hazmat.primitives import hashes
-from cryptography.hazmat.primitives import serialization
-from cryptography.hazmat.primitives.asymmetric import padding
-from cryptography.hazmat.primitives.asymmetric import rsa
-
-from cryptography.hazmat.primitives.asymmetric.rsa import RSAPrivateKeyWithSerialization
+from cryptography.hazmat.primitives import hashes, serialization
+from cryptography.hazmat.primitives.asymmetric import padding, rsa
+from cryptography.hazmat.primitives.asymmetric.rsa import \
+    RSAPrivateKeyWithSerialization
 
 RSA_KEY_LENGTH = 3072
 

src/mender/settings/settings.py

@@ -13,7 +13,6 @@
 #    limitations under the License.
 import os.path
 
-
 SLEEP_INTERVAL = 60
 
 

src/mender/util/timeutil.py

@@ -11,10 +11,9 @@
 #    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
-from datetime import timedelta
-from datetime import datetime
 import time
 import typing
+from datetime import datetime, timedelta
 
 
 class IsItTime:

tests/unit/test_authorized.py

@@ -13,10 +13,11 @@
 #    limitations under the License.
 
 import logging as log
+
 import pytest
 
-import mender.security.key as key
 import mender.client.authorize as authorize
+import mender.security.key as key
 
 
 @pytest.fixture(name="server_url")

tests/unit/test_config.py

@@ -12,10 +12,12 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-import os
 import json
 import logging as log
+import os
+
 import pytest
+
 import mender.config.config as config
 
 GLOBAL_TESTDATA = {

tests/unit/test_deployments.py

@@ -12,12 +12,11 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-import os
 import hashlib
-
-import requests
+import os
 
 import pytest
+import requests
 from werkzeug.wrappers import Response
 
 import mender.client.deployments as deployments

tests/unit/test_inventory.py

@@ -13,6 +13,7 @@
 #    limitations under the License.
 
 import logging as log
+
 import pytest
 
 import mender.client.inventory as inventory

tests/unit/test_log.py

@@ -14,6 +14,7 @@
 import json
 import logging as testlogger
 import os.path
+
 import pytest
 
 import mender.log.log as mlog

tests/unit/test_mender.py

@@ -17,14 +17,12 @@
 
 import pytest
 
-import mender.mender as main
-
 import mender.bootstrap.bootstrap as bootstrap
 import mender.client.authorize as authorize
 import mender.client.deployments as deployments
+import mender.mender as main
 import mender.settings.settings as settings
 import mender.statemachine.statemachine as statemachine
-
 from mender.log.log import DeploymentLogHandler
 
 

tests/unit/test_script_aggregator.py

@@ -12,8 +12,8 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-import os
 import logging as log
+import os
 import stat
 
 import pytest

tests/unit/test_statemachine.py

@@ -19,8 +19,6 @@
 
 import pytest
 
-from mender.client import HTTPUnathorized
-from mender.util import timeutil
 import mender.client.deployments as deployments
 import mender.client.inventory as client_inventory
 import mender.config.config as config
@@ -30,10 +28,10 @@
 import mender.scripts.devicetype as devicetype
 import mender.scripts.runner as installscriptrunner
 import mender.settings.settings as settings
-
-from mender.log.log import DeploymentLogHandler
-
 import mender.statemachine.statemachine as statemachine
+from mender.client import HTTPUnathorized
+from mender.log.log import DeploymentLogHandler
+from mender.util import timeutil
 
 
 @pytest.fixture(name="ctx")