codemagic-cli-tools 0.50.5__tar.gz → 0.50.7__tar.gz

{codemagic_cli_tools-0.50.5 → codemagic_cli_tools-0.50.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: codemagic-cli-tools
-Version: 0.50.5
+Version: 0.50.7
 Summary: CLI tools used in Codemagic builds
 Home-page: https://github.com/codemagic-ci-cd/cli-tools
 License: GPL-3.0-or-later

{codemagic_cli_tools-0.50.5 → codemagic_cli_tools-0.50.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "codemagic-cli-tools"
-version = "0.50.5"
+version = "0.50.7"
 description = "CLI tools used in Codemagic builds"
 readme = "README.md"
 authors = [

{codemagic_cli_tools-0.50.5 → codemagic_cli_tools-0.50.7}/src/codemagic/__version__.py

@@ -1,5 +1,5 @@
 __title__ = "codemagic-cli-tools"
 __description__ = "CLI tools used in Codemagic builds"
-__version__ = '0.50.5'
+__version__ = '0.50.7'
 __url__ = "https://github.com/codemagic-ci-cd/cli-tools"
 __licence__ = "GNU General Public License v3.0"

{codemagic_cli_tools-0.50.5 → codemagic_cli_tools-0.50.7}/src/codemagic/__version__.py-e

@@ -1,5 +1,5 @@
 __title__ = "codemagic-cli-tools"
 __description__ = "CLI tools used in Codemagic builds"
-__version__ = "0.50.5.dev"
+__version__ = "0.50.6.dev"
 __url__ = "https://github.com/codemagic-ci-cd/cli-tools"
 __licence__ = "GNU General Public License v3.0"

{codemagic_cli_tools-0.50.5 → codemagic_cli_tools-0.50.7}/src/codemagic/google/resources/release.py

@@ -15,7 +15,7 @@ class Release(Resource):
 
     name: str
     displayVersion: str
-    buildVersion: int
+    buildVersion: str
     createTime: datetime
     firebaseConsoleUri: str
     testingUri: str
@@ -25,7 +25,5 @@ class Release(Resource):
     def __post_init__(self):
         if isinstance(self.createTime, str):
             self.createTime = datetime.fromisoformat(self.createTime.rstrip("Z")).replace(tzinfo=timezone.utc)
-        if isinstance(self.buildVersion, str):
-            self.buildVersion = int(self.buildVersion)
         if isinstance(self.releaseNotes, dict):
             self.releaseNotes = ReleaseNotes(self.releaseNotes["text"])

{codemagic_cli_tools-0.50.5 → codemagic_cli_tools-0.50.7}/src/codemagic/models/certificate.py

@@ -105,12 +105,16 @@ class Certificate(JsonSerializable, RunningCliAppMixin, StringConverterMixin):
         Get the timestamp at which the certificate stops being valid
         as an ASN.1 TIME YYYYMMDDhhmmssZ
         """
-        not_after = self.certificate.not_valid_after
-        return not_after.strftime("%Y%m%d%H%M%SZ")
+        return self.expires_at.strftime("%Y%m%d%H%M%SZ")
 
     @property
     def not_before(self) -> str:
-        not_before = self.certificate.not_valid_before
+        try:
+            not_before = self.certificate.not_valid_before_utc
+        except AttributeError:
+            # x509.Certificate.not_valid_before_utc was added in cryptography 42.0.0.
+            # Use the legacy naive datetime instead.
+            not_before = self.certificate.not_valid_before
         return not_before.strftime("%Y%m%d%H%M%SZ")
 
     @property
@@ -120,7 +124,12 @@ class Certificate(JsonSerializable, RunningCliAppMixin, StringConverterMixin):
 
     @property
     def expires_at(self) -> datetime:
-        return self.certificate.not_valid_after.replace(tzinfo=timezone.utc)
+        try:
+            return self.certificate.not_valid_after_utc
+        except AttributeError:
+            # x509.Certificate.not_valid_after_utc was added in cryptography 42.0.0.
+            # Use the legacy naive datetime instead.
+            return self.certificate.not_valid_after.replace(tzinfo=timezone.utc)
 
     @property
     def serial(self) -> int:

{codemagic_cli_tools-0.50.5 → codemagic_cli_tools-0.50.7}/src/codemagic/tools/firebase_app_distribution/actions/get_latest_build_version_action.py

@@ -14,7 +14,7 @@ class GetLatestBuildVersionAction(FirebaseAppDistributionAction, ABC):
         "get-latest-build-version",
         ReleasesArgument.APP_ID,
     )
-    def get_latest_build_version(self, app_id: str, should_print: bool = True) -> int:
+    def get_latest_build_version(self, app_id: str, should_print: bool = True) -> str:
         """
         Get latest build version from Firebase
         """
@@ -27,5 +27,5 @@ class GetLatestBuildVersionAction(FirebaseAppDistributionAction, ABC):
             raise FirebaseAppDistributionError(f"No releases available for {app_identifier.app_id}")
 
         build_version = releases[0].buildVersion
-        self.echo(str(build_version)) if should_print else None
+        self.echo(build_version) if should_print else None
         return build_version

{codemagic_cli_tools-0.50.5 → codemagic_cli_tools-0.50.7}/src/codemagic/tools/firebase_app_distribution/firebase_app_distribution_action.py

@@ -26,7 +26,7 @@ class FirebaseAppDistributionAction(ABC):
     # Action signatures in alphabetical order
 
     @abstractmethod
-    def get_latest_build_version(self, app_id: str, should_print: bool = True) -> int:
+    def get_latest_build_version(self, app_id: str, should_print: bool = True) -> str:
         from .actions import GetLatestBuildVersionAction
 
         _ = GetLatestBuildVersionAction.get_latest_build_version  # Implementation

{codemagic_cli_tools-0.50.5 → codemagic_cli_tools-0.50.7}/tests/google/conftest.py

@@ -14,7 +14,7 @@ def release():
         name="projects/228333310124/apps/1:228333310124:ios:5e439e0d0231a788ac8f09/releases/0fam13pr3rea0",
         releaseNotes=ReleaseNotes("Something new :) :)"),
         displayVersion="0.0.42",
-        buildVersion=70,
+        buildVersion="1.0.3",
         createTime=datetime(2023, 5, 18, 12, 30, 17, 454581, tzinfo=timezone.utc),
         firebaseConsoleUri=mock.ANY,
         testingUri=mock.ANY,
@@ -28,7 +28,7 @@ def release_response():
         "name": "projects/228333310124/apps/1:228333310124:ios:5e439e0d0231a788ac8f09/releases/0fam13pr3rea0",
         "releaseNotes": {"text": "Something new :) :)"},
         "displayVersion": "0.0.42",
-        "buildVersion": "70",
+        "buildVersion": "1.0.3",
         "createTime": "2023-05-18T12:30:17.454581Z",
         "firebaseConsoleUri": "",
         "testingUri": "",

{codemagic_cli_tools-0.50.5 → codemagic_cli_tools-0.50.7}/tests/google/test_firebase_client.py

@@ -60,7 +60,7 @@ def test_list_releases(app_identifier, firebase_client, release, mock_releases):
     releases = firebase_client.releases.list(app_identifier, order_by=order_by, page_size=2)
 
     assert releases[0] == release
-    assert releases[1].buildVersion == 71
+    assert releases[1].buildVersion == "71"
 
 
 def test_list_releases_limit(app_identifier, firebase_client, mock_releases):
@@ -91,4 +91,4 @@ def test_list_releases_pagination(app_identifier, release, firebase_client, mock
 
     assert len(releases) == 2
     assert releases[0] == release
-    assert releases[1].buildVersion == 71
+    assert releases[1].buildVersion == "71"

{codemagic_cli_tools-0.50.5 → codemagic_cli_tools-0.50.7}/tests/tools/test_firebase_app_distribution.py

@@ -175,7 +175,7 @@ def test_list_releases_with_limit(firebase_app_distribution, mock_releases_list,
 def test_get_latest_build_version(firebase_app_distribution, mock_releases_list, app_identifier):
     build_number = firebase_app_distribution.get_latest_build_version(app_identifier.app_id)
     mock_releases_list.assert_called_once_with(app_identifier, limit=1)
-    assert build_number == 71
+    assert build_number == "71"
 
 
 def test_get_latest_build_version_no_releases(firebase_app_distribution, app_identifier):