Merge pull request #957 from mdujava/skipversion

Dont pass condition as string for skipif + isort

Author: mdujava

.git-blame-ignore-revs

@@ -13,3 +13,4 @@ d499948418f6e1dc432dabf11f158e58d9a0b0d8 # black 25.1.0 changes
 7619a4c61d7914b16088f585e2bceacebf26ec88 # reduce new lines to one after import block
 a5deb34f80c6644936cb192686ded29a292d1e8f # unpacking tuple does not need () on lhs
 80bb9d6d9f11ac33d6c9287261d2ce44aadd3f87 # fix type ignore comment
+1518dcb9486e58b2223b6026eebbc15f516c7709 # isort --profile black

setup.cfg

@@ -2,5 +2,8 @@
 max-line-length = 120
 ignore = E203,W503
 
+[isort]
+profile = "black"
+
 [mypy]
 ignore_missing_imports = True

testsuite/__init__.py

@@ -20,10 +20,11 @@
     handler.setFormatter(formatter)
     logger.addHandler(handler)
 
-from pathlib import Path  # noqa
-from packaging.version import Version  # noqa
-from weakget import weakget
+from pathlib import Path
+
 import importlib_resources as resources
+from packaging.version import Version
+from weakget import weakget
 
 from testsuite.config import settings  # noqa
 

testsuite/billing.py

@@ -5,7 +5,6 @@
 import stripe
 from braintree.exceptions.request_timeout_error import RequestTimeoutError
 from braintree.exceptions.service_unavailable_error import ServiceUnavailableError
-
 from threescale_api.resources import InvoiceState
 
 

testsuite/capabilities/__init__.py

@@ -7,7 +7,7 @@
 """
 
 import enum
-from typing import Set, Callable, Any, Tuple, List
+from typing import Any, Callable, List, Set, Tuple
 
 # Users should have access only to these public methods/decorators
 __all__ = ["CapabilityRegistry", "Capability"]

testsuite/capabilities/providers.py

@@ -1,9 +1,9 @@
 """This module is where most of the capability providers should be to not have them scattered around"""
 
 from testsuite import gateways
-from testsuite.capabilities import CapabilityRegistry, Capability
-from testsuite.configuration import openshift
+from testsuite.capabilities import Capability, CapabilityRegistry
 from testsuite.config import settings
+from testsuite.configuration import openshift
 
 
 def gateway_capabilities():

testsuite/certificates/__init__.py

@@ -1,7 +1,7 @@
 """Collection of classes for working with different ssl certificate tools."""
 
 from abc import ABC, abstractmethod
-from typing import List, Optional, Tuple, Dict
+from typing import Dict, List, Optional, Tuple
 
 from testsuite.certificates.persist import TmpFilePersist
 

testsuite/certificates/cfssl/cli.py

@@ -3,11 +3,16 @@
 import json
 import os
 import subprocess
-from typing import Optional, List, Tuple, Dict, Any
+from typing import Any, Dict, List, Optional, Tuple
 
 import importlib_resources as resources
 
-from testsuite.certificates import KeyProvider, SigningProvider, Certificate, UnsignedKey
+from testsuite.certificates import (
+    Certificate,
+    KeyProvider,
+    SigningProvider,
+    UnsignedKey,
+)
 from testsuite.certificates.cfssl import CFSSLException
 
 

testsuite/certificates/stores.py

@@ -5,7 +5,7 @@
 from abc import ABC
 from typing import Dict
 
-from testsuite.certificates import CertificateStore, Certificate
+from testsuite.certificates import Certificate, CertificateStore
 
 
 def _persist(path, name: str, ext: str, content: str):

testsuite/configuration.py

@@ -1,12 +1,12 @@
 """Module responsible for processing configuration"""
 
 import inspect
-from typing import Dict, Any, Mapping
+from typing import Any, Dict, Mapping
 
 from weakget import weakget
 
-from testsuite.config import settings
 from testsuite.capabilities import Singleton
+from testsuite.config import settings
 from testsuite.openshift.client import OpenShiftClient