Bug 1800611 - part 3: Use Mobile version numbers for Android-Components

mozilla-releng · Nov 28, 2022 · ed52d75 · ed52d75
1 parent 5c68958
commit ed52d75
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/api/src/shipit_api/admin/release.py b/api/src/shipit_api/admin/release.py
@@ -8,7 +8,6 @@
 import requests
 from mozilla_version.fenix import FenixVersion  # TODO replace with MobileVersion
 from mozilla_version.gecko import DeveditionVersion, FennecVersion, FirefoxVersion, ThunderbirdVersion
-from mozilla_version.maven import MavenVersion
 from mozilla_version.mobile import MobileVersion
 
 from shipit_api.common.config import SUPPORTED_FLAVORS
@@ -17,7 +16,7 @@
 logger = logging.getLogger(__name__)
 
 _VERSION_CLASS_PER_PRODUCT = {
-    Product.ANDROID_COMPONENTS: MavenVersion,
+    Product.ANDROID_COMPONENTS: MobileVersion,
     Product.DEVEDITION: DeveditionVersion,
     Product.PINEBUILD: FirefoxVersion,
     Product.FENIX: FenixVersion,

diff --git a/api/src/shipit_api/public/api.py b/api/src/shipit_api/public/api.py
@@ -9,7 +9,6 @@
 from flask import abort, current_app
 from mozilla_version.fenix import FenixVersion
 from mozilla_version.gecko import DeveditionVersion, FennecVersion, FirefoxVersion, ThunderbirdVersion
-from mozilla_version.maven import MavenVersion
 from mozilla_version.mobile import MobileVersion
 from werkzeug.exceptions import BadRequest
 
@@ -19,7 +18,7 @@
 logger = logging.getLogger(__name__)
 
 VERSION_CLASSES = {
-    Product.ANDROID_COMPONENTS.value: MavenVersion,
+    Product.ANDROID_COMPONENTS.value: MobileVersion,
     Product.DEVEDITION.value: DeveditionVersion,
     # XXX revisit when we know how pinebuild will be versioned
     Product.PINEBUILD.value: FirefoxVersion,