suite-py 1.41.8__py3-none-any.whl → 1.41.10__py3-none-any.whl

suite_py/__version__.py

@@ -1,2 +1,2 @@
 # -*- encoding: utf-8 -*-
-__version__ = "1.41.8"
+__version__ = "1.41.10"

suite_py/cli.py

@@ -4,13 +4,39 @@
 # for performance reasons, so turn off the lint warning
 # pylint: disable=import-outside-toplevel
 
-import os
+# We need to inject truststore code before we do any libraries
+# that might end up creating an ssl.SSlContext object
+# pylint: disable=wrong-import-position
+
 import sys
+
+
+def maybe_inject_truststore() -> None:
+    """
+    Injects the truststore package into the system ssl store, to fix verficiation certificate issues when using warp.
+    """
+    if sys.version_info >= (3, 10):
+        import truststore
+
+        truststore.inject_into_ssl()
+    else:
+        # pylint: disable-next=reimported
+        from suite_py.lib import logger
+
+        logger.warning(
+            "Your python version is older than 3.10 and doesn't support the truststore package. You might experience issues with certificate verification when connected to the warp VPN.\nPlease update to python 3.10 or newer"
+        )
+
+
+# Needs to be done before any other imports
+maybe_inject_truststore()
+
+import os
 from functools import wraps
+from importlib.metadata import PackageNotFoundError, version
 from typing import Optional
 
 import click
-import pkg_resources
 import requests
 from autoupgrade import Package
 from click.exceptions import ClickException
@@ -25,33 +51,21 @@ from suite_py.lib.handler.captainhook_handler import CaptainHook
 from suite_py.lib.handler.okta_handler import Okta
 from suite_py.lib.tokens import Tokens
 
+# pylint: enable=wrong-import-position
+
 ALLOW_NO_GIT_SUBCOMMAND = ["login", "aggregator"]
 ALLOW_NO_HOME_SUBCOMMAND = ["login", "aggregator"]
 
 
-def maybe_inject_truststore() -> None:
-    """
-    Injects the truststore package into the system ssl store, to fix verficiation certificate issues when using warp.
+def fetch_latest_version() -> Optional[str]:
     """
-    if sys.version_info >= (3, 10):
-        import truststore
-
-        truststore.inject_into_ssl()
-    else:
-        logger.warning(
-            "Your python version is older than 3.10 and doesn't support the truststore package. You might experience issues with certificate verification when connected to the warp VPN.\nPlease update to python 3.10 or newer"
-        )
-
-
-def fetch_latest_version() -> Optional[pkg_resources.packaging.version.Version]:
-    """
-    Fetches the latest version of suite-py as a pkg_resources parsed version
+    Fetches the latest version of suite-py as a str
     Returns None on error
     """
     try:
         # pylint: disable-next=missing-timeout
         pkg_info = requests.get("https://pypi.org/pypi/suite-py/json").json()
-        return pkg_resources.parse_version(pkg_info["info"]["version"])
+        return pkg_info["info"]["version"]
     except Exception:
         logger.warning("Failed to fetch latest version of suite-py!")
         return None
@@ -65,8 +79,8 @@ def upgrade_suite_py_if_needed(break_on_missing_package: bool = False) -> None:
     """
 
     try:
-        pkg_resources.get_distribution("suite_py")
-    except pkg_resources.DistributionNotFound as error:
+        installed_version = version("suite_py")
+    except PackageNotFoundError as error:
         # We are in a virtual environment where suite-py is not installed, don't bother trying to upgrade
         if break_on_missing_package:
             raise error
@@ -76,12 +90,10 @@ def upgrade_suite_py_if_needed(break_on_missing_package: bool = False) -> None:
         )
         return
 
-    current_version = pkg_resources.parse_version(__version__)
-
     try:
         # If available, upgrade (if needed)
         latest_version = fetch_latest_version()
-        if latest_version is None or latest_version > current_version:
+        if latest_version is None or latest_version > installed_version:
             # If we fail to fetch the latest version, fallback to attempting the upgrade anyway
             Package("suite_py").upgrade()
     except Exception as error:
@@ -245,8 +257,8 @@ def cli_unlock_project(obj, environment):
 @click.pass_obj
 @catch_exceptions
 def cli_open_pr(obj):
-    from suite_py.commands.open_pr import OpenPR
     from suite_py.commands.ask_review import AskReview
+    from suite_py.commands.open_pr import OpenPR
 
     ask_review = obj.call(AskReview)
     obj.call(OpenPR, ask_review=ask_review).run()

suite_py/commands/batch_job.py

@@ -48,6 +48,8 @@ class BatchJob:
         self._start_job(country, command)
 
     def _start_job(self, country, command):
+        promotion = {}
+
         if self._environment == "staging":
             build = self._get_latest_master_build()
 

suite_py/commands/secret.py

@@ -78,7 +78,6 @@ class Secret:
 
         if prompt_utils.ask_confirm(f"Do you want to grant permissions for {secret}?"):
             self._set_grant_on_secret(secret)
-            return
 
     def _set_grant_on_secret(self, secret_name):
         environment = self._ask_environment()

{suite_py-1.41.8.dist-info → suite_py-1.41.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: suite-py
-Version: 1.41.8
+Version: 1.41.10
 Summary: 
 Author: larrywax, EugenioLaghi, michelangelomo
 Author-email: devops@prima.it
@@ -21,7 +21,7 @@ Requires-Dist: black (>=22.6,<25.0)
 Requires-Dist: boto3 (>=1.17.84)
 Requires-Dist: cement (>=3.0)
 Requires-Dist: colorama (>=0.4.3)
-Requires-Dist: cryptography (==42.0.5)
+Requires-Dist: cryptography (==42.0.7)
 Requires-Dist: halo (>=0.0.28)
 Requires-Dist: inquirer (==3.1.4)
 Requires-Dist: itsdangerous (==2.2.0)

{suite_py-1.41.8.dist-info → suite_py-1.41.10.dist-info}/RECORD

@@ -1,10 +1,10 @@
 suite_py/__init__.py,sha256=REmi3D0X2G1ZWnYpKs8Ffm3NIj-Hw6dMuvz2b9NW344,142
-suite_py/__version__.py,sha256=C72BQjNOg72voqmXyLIqBdkVITPqxMJeS157soE2SM8,49
-suite_py/cli.py,sha256=EaXTn4YONpw0Q5yuUeo9ANsLClHa0A-S87wHYnLwGOs,14934
+suite_py/__version__.py,sha256=i6HmzASsryZBCC4p1Cf_qbUBilep7P848kIqMZUnTNs,50
+suite_py/cli.py,sha256=oGKcY9TUvGgXJl1tYBlkvSCcz6A6Aa7Fye5yEPqB4F8,15159
 suite_py/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 suite_py/commands/aggregator.py,sha256=_xyyX7MOMZzDEvzj2AI03OF3sut5PpSIyuRjUiCp5aI,5747
 suite_py/commands/ask_review.py,sha256=yN__Ac-fiZBPShjRDhyCCQZGfVlQE16KozoJk4UtiNw,3788
-suite_py/commands/batch_job.py,sha256=pcSpDov9uNY4z9MjQ8KDapEC9zhEJDe7XcJV7uidHyE,7450
+suite_py/commands/batch_job.py,sha256=flTSxmNaUv1VcL91Lv-BwEjFpEyF8APTNysQE_2jPYE,7474
 suite_py/commands/bump.py,sha256=oFZU1hPfD11ujFC5G7wFyQOf2alY3xp2SO1h1ldjf3s,5406
 suite_py/commands/check.py,sha256=0e2NsPi3cqvCwtNYzhR1UroT59bCojLlGo69vv3FiOA,4074
 suite_py/commands/common.py,sha256=aWCEvO3hqdheuMUmZcHuc9EGZPQTk7VkzkHJk283MxQ,566
@@ -20,7 +20,7 @@ suite_py/commands/merge_pr.py,sha256=gUpoDx3q23X6gF9PLXCZnIL9DfRw_3D0LlqBlGVt7rA
 suite_py/commands/open_pr.py,sha256=U7MVl-JFKu1mdfxC_UvxUHtPLEln0g4kKl-SvP-6zd8,7159
 suite_py/commands/project_lock.py,sha256=b7OkGysue_Sl13VIT7B5CTBppCvrB_Q6iC0IJRBSHp8,1909
 suite_py/commands/release.py,sha256=clKgmsNgR9DdgBkYjXI3NqVaw8_mCe2TZHegby3ESn4,16634
-suite_py/commands/secret.py,sha256=IOPQBTXsi8qFd84yxGe38U9b1x53dHguoLolCTOtRoU,7995
+suite_py/commands/secret.py,sha256=Us7wvsqAPJhe1nUSHOmzO1RSyZriKAGKwi2YEhPNIA4,7976
 suite_py/commands/set_token.py,sha256=fehIqKjKhE-BJGFhgkPTo3Ntr0MvpgLd6EC5yjKuRs8,1508
 suite_py/commands/status.py,sha256=0JUK53_d1-U3WNS742JD2QTiGmCGZONo3jJx8WR7q70,1122
 suite_py/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -48,7 +48,7 @@ suite_py/lib/requests/session.py,sha256=P32H3cWnCWunu91WIj2iDM5U3HzaBglg60VN_C9J
 suite_py/lib/symbol.py,sha256=z3QYBuNIwD3qQ3zF-cLOomIr_-C3bO_u5UIDAHMiyTo,60
 suite_py/lib/tokens.py,sha256=kK4vatd5iKEFaue0BZwK1f66YOh9zLdLzP41ZOhjMCU,5534
 suite_py/templates/login.html,sha256=fJLls2SB84oZTSrxTdA5q1PqfvIHcCD4fhVWfyco7Ig,861
-suite_py-1.41.8.dist-info/METADATA,sha256=YpG9ptQzXGsGoS0KjGyMKsoNlNV4eLRQRUu57UJZ0cQ,1532
-suite_py-1.41.8.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-suite_py-1.41.8.dist-info/entry_points.txt,sha256=dVKLC-9Infy-dHJT_MkK6LcDjOgBCJ8lfPkURJhBjxE,46
-suite_py-1.41.8.dist-info/RECORD,,
+suite_py-1.41.10.dist-info/METADATA,sha256=A_GGYDs7Uq5qzCIiUW-PKqxk0QdgS4su2FMwpKWc4A4,1533
+suite_py-1.41.10.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+suite_py-1.41.10.dist-info/entry_points.txt,sha256=dVKLC-9Infy-dHJT_MkK6LcDjOgBCJ8lfPkURJhBjxE,46
+suite_py-1.41.10.dist-info/RECORD,,