diff --git a/src/info_parser.py b/src/info_parser.py index 16ded0a..96200a8 100644 --- a/src/info_parser.py +++ b/src/info_parser.py @@ -57,7 +57,7 @@ class InfoParser: "templates": ["ApplicationTemplate"], "settings": {"base": { # TODO: change to .semantic, once builds are OK - "MARKETING_VERSION": self.version.semantic_downgraded, + "MARKETING_VERSION": self.version.semantic, "PRODUCT_BUNDLE_IDENTIFIER": self._bundle_id(), "INFOPLIST_FILE": f"custom/{self._info_plist_path()}", "INFOPLIST_KEY_CFBundleDisplayName": self._app_name(), diff --git a/src/tag_validator.py b/src/tag_validator.py index bfddf7c..55decd2 100644 --- a/src/tag_validator.py +++ b/src/tag_validator.py @@ -42,7 +42,7 @@ def _is_valid(tag): # save the specific parts of the tag as temp files: Path('.brand_name').write_text(f"{brand.name}") Path('.build_number').write_text(f"{version.build_number}") - Path('.version_number').write_text(f"{version.semantic_downgraded}") + Path('.version_number').write_text(f"{version.semantic}") # required as an output, we can pipe on: print(f"{brand.name} {version.build_number}") diff --git a/src/version.py b/src/version.py index b188208..a42ff75 100644 --- a/src/version.py +++ b/src/version.py @@ -14,7 +14,6 @@ class Version: raise ValueError(f"invalid year: {year}") self.semantic = f"{year}.{month}.{build_number}" - self.semantic_downgraded = f"{year-1000}.{month}.{build_number}" self.build_number = build_number @classmethod diff --git a/tests/version_test.py b/tests/version_test.py index 95a1119..4013399 100644 --- a/tests/version_test.py +++ b/tests/version_test.py @@ -8,19 +8,15 @@ class VersionTest(unittest.TestCase): version = Version.from_file_name( "dwds_de_dictionary_nopic_2023-11-20", build_number=10) self.assertEqual(version.semantic, "2023.11.10") - self.assertEqual(version.semantic_downgraded, "1023.11.10") version = Version.from_file_name( "dwds_de_dictionary_nopic_2023-09-20", build_number=0) self.assertEqual(version.semantic, "2023.9.0") - self.assertEqual(version.semantic_downgraded, "1023.9.0") version = Version.from_file_name( "dwds_de_dictionary_nopic_2023-01", build_number=7) self.assertEqual(version.semantic, "2023.1.7") - self.assertEqual(version.semantic_downgraded, "1023.1.7") version = Version.from_file_name( "dwds_de_dictionary_nopic_2023-12", build_number=129) self.assertEqual(version.semantic, "2023.12.129") - self.assertEqual(version.semantic_downgraded, "1023.12.129")