From 023d1f642cba6cf10fc7de8fe44f1cb1d4b53813 Mon Sep 17 00:00:00 2001 From: Justin Wood Date: Sat, 2 Jun 2018 20:41:04 -0400 Subject: [PATCH] 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 --- testing/mozharness/scripts/desktop_l10n.py | 7 +------ testing/mozharness/scripts/mobile_l10n.py | 8 +------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/testing/mozharness/scripts/desktop_l10n.py b/testing/mozharness/scripts/desktop_l10n.py index 3bbc17fd6621..8763fb831b14 100755 --- a/testing/mozharness/scripts/desktop_l10n.py +++ b/testing/mozharness/scripts/desktop_l10n.py @@ -28,7 +28,6 @@ from mozharness.mozilla.building.buildbase import ( ) from mozharness.mozilla.l10n.locales import LocalesMixin from mozharness.mozilla.mar import MarMixin -from mozharness.base.python import VirtualenvMixin try: import simplejson as json @@ -64,7 +63,7 @@ runtime_config_tokens = ('buildid', 'version', 'locale', 'from_buildid', # DesktopSingleLocale {{{1 class DesktopSingleLocale(LocalesMixin, AutomationMixin, VCSMixin, BaseScript, MarMixin, - VirtualenvMixin, TransferMixin): + TransferMixin): """Manages desktop repacks""" config_options = [[ ['--locale', ], @@ -129,10 +128,6 @@ class DesktopSingleLocale(LocalesMixin, AutomationMixin, "log_name": "single_locale", "appName": "Firefox", "hashType": "sha512", - 'virtualenv_modules': [ - 'requests==2.8.1', - ], - 'virtualenv_path': 'venv', }, } diff --git a/testing/mozharness/scripts/mobile_l10n.py b/testing/mozharness/scripts/mobile_l10n.py index 02c233ffd90c..7837e0cd73ab 100755 --- a/testing/mozharness/scripts/mobile_l10n.py +++ b/testing/mozharness/scripts/mobile_l10n.py @@ -32,13 +32,12 @@ from mozharness.mozilla.tooltool import TooltoolMixin from mozharness.base.vcs.vcsbase import MercurialScript from mozharness.mozilla.l10n.locales import LocalesMixin from mozharness.mozilla.secrets import SecretsMixin -from mozharness.base.python import VirtualenvMixin # MobileSingleLocale {{{1 class MobileSingleLocale(LocalesMixin, TransferMixin, TooltoolMixin, AutomationMixin, - MercurialScript, VirtualenvMixin, SecretsMixin): + MercurialScript, SecretsMixin): config_options = [[ ['--locale', ], {"action": "extend", @@ -96,14 +95,9 @@ class MobileSingleLocale(LocalesMixin, "setup", "repack", "upload-repacks", - "create-virtualenv", "summary", ], 'config': { - 'virtualenv_modules': [ - 'requests==2.8.1', - ], - 'virtualenv_path': 'venv', }, } LocalesMixin.__init__(self)