suite-py 1.41.8__tar.gz → 1.41.9__tar.gz

{suite_py-1.41.8 → suite_py-1.41.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: suite-py
-Version: 1.41.8
+Version: 1.41.9
 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 → suite_py-1.41.9}/pyproject.toml

@@ -2,7 +2,7 @@
 authors = ["larrywax, EugenioLaghi, michelangelomo <devops@prima.it>"]
 description = ""
 name = "suite-py"
-version = "1.41.8"
+version = "1.41.9"
 
 [tool.poetry.dependencies]
 Click = ">=7.0"
@@ -34,7 +34,7 @@ rich = "==13.7.1"
 semver = "^2.13.0"
 termcolor = ">=1.1.0"
 truststore = {version = ">=0.7,<0.10", python = ">=3.10"}
-cryptography = "42.0.5"
+cryptography = "42.0.7"
 
 [tool.poetry.dev-dependencies]
 

{suite_py-1.41.8 → suite_py-1.41.9}/suite_py/__version__.py

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

{suite_py-1.41.8 → suite_py-1.41.9}/suite_py/cli.py

@@ -9,8 +9,8 @@ import sys
 from functools import wraps
 from typing import Optional
 
+from importlib.metadata import version, PackageNotFoundError
 import click
-import pkg_resources
 import requests
 from autoupgrade import Package
 from click.exceptions import ClickException
@@ -43,15 +43,15 @@ def maybe_inject_truststore() -> None:
         )
 
 
-def fetch_latest_version() -> Optional[pkg_resources.packaging.version.Version]:
+def fetch_latest_version() -> Optional[str]:
     """
-    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 +65,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 +76,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:

{suite_py-1.41.8 → suite_py-1.41.9}/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-1.41.8 → suite_py-1.41.9}/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()