Bug 1466222 - Drop l10n mozharness virtualenv support. r=catlee

for "Cleanup l10n mozharness config files."

Differential Revision: https://phabricator.services.mozilla.com/D1520

--HG--
extra : rebase_source : b77130fcf66ff10308b9f2b8d33fc82ea41793dc
This commit is contained in:
Justin Wood 2018-06-02 20:41:04 -04:00
Родитель b3d0fc5dc8
Коммит 023d1f642c
2 изменённых файлов: 2 добавлений и 13 удалений

Просмотреть файл

@ -28,7 +28,6 @@ from mozharness.mozilla.building.buildbase import (
) )
from mozharness.mozilla.l10n.locales import LocalesMixin from mozharness.mozilla.l10n.locales import LocalesMixin
from mozharness.mozilla.mar import MarMixin from mozharness.mozilla.mar import MarMixin
from mozharness.base.python import VirtualenvMixin
try: try:
import simplejson as json import simplejson as json
@ -64,7 +63,7 @@ runtime_config_tokens = ('buildid', 'version', 'locale', 'from_buildid',
# DesktopSingleLocale {{{1 # DesktopSingleLocale {{{1
class DesktopSingleLocale(LocalesMixin, AutomationMixin, class DesktopSingleLocale(LocalesMixin, AutomationMixin,
VCSMixin, BaseScript, MarMixin, VCSMixin, BaseScript, MarMixin,
VirtualenvMixin, TransferMixin): TransferMixin):
"""Manages desktop repacks""" """Manages desktop repacks"""
config_options = [[ config_options = [[
['--locale', ], ['--locale', ],
@ -129,10 +128,6 @@ class DesktopSingleLocale(LocalesMixin, AutomationMixin,
"log_name": "single_locale", "log_name": "single_locale",
"appName": "Firefox", "appName": "Firefox",
"hashType": "sha512", "hashType": "sha512",
'virtualenv_modules': [
'requests==2.8.1',
],
'virtualenv_path': 'venv',
}, },
} }

Просмотреть файл

@ -32,13 +32,12 @@ from mozharness.mozilla.tooltool import TooltoolMixin
from mozharness.base.vcs.vcsbase import MercurialScript from mozharness.base.vcs.vcsbase import MercurialScript
from mozharness.mozilla.l10n.locales import LocalesMixin from mozharness.mozilla.l10n.locales import LocalesMixin
from mozharness.mozilla.secrets import SecretsMixin from mozharness.mozilla.secrets import SecretsMixin
from mozharness.base.python import VirtualenvMixin
# MobileSingleLocale {{{1 # MobileSingleLocale {{{1
class MobileSingleLocale(LocalesMixin, class MobileSingleLocale(LocalesMixin,
TransferMixin, TooltoolMixin, AutomationMixin, TransferMixin, TooltoolMixin, AutomationMixin,
MercurialScript, VirtualenvMixin, SecretsMixin): MercurialScript, SecretsMixin):
config_options = [[ config_options = [[
['--locale', ], ['--locale', ],
{"action": "extend", {"action": "extend",
@ -96,14 +95,9 @@ class MobileSingleLocale(LocalesMixin,
"setup", "setup",
"repack", "repack",
"upload-repacks", "upload-repacks",
"create-virtualenv",
"summary", "summary",
], ],
'config': { 'config': {
'virtualenv_modules': [
'requests==2.8.1',
],
'virtualenv_path': 'venv',
}, },
} }
LocalesMixin.__init__(self) LocalesMixin.__init__(self)