From 5dae91bdf875eb5da68803e2948e32244dbd035d Mon Sep 17 00:00:00 2001 From: Adeel Khan Date: Tue, 11 Feb 2020 20:07:42 +0500 Subject: [PATCH] Removing paver command This is not needed in Makefile as all the logic and invocation of compilejs would be done via ecommerce-script repo. PROD-960 --- Makefile | 2 +- pavelib/i18n.py | 8 ++------ pavelib/paver_tests/test_i18n.py | 2 ++ 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index ec559264db..0f1a955239 100644 --- a/Makefile +++ b/Makefile @@ -51,7 +51,7 @@ pull_translations: ## pull translations from Transifex git clean -fdX conf/locale/rtl git clean -fdX conf/locale/eo i18n_tool validate - paver i18n_compilejs + detect_changed_source_translations: ## check if translation files are up-to-date i18n_tool changed diff --git a/pavelib/i18n.py b/pavelib/i18n.py index a424e1534a..0d8d2cc157 100644 --- a/pavelib/i18n.py +++ b/pavelib/i18n.py @@ -91,17 +91,13 @@ def i18n_dummy(): @task @needs( "pavelib.prereqs.install_prereqs", - "pavelib.i18n.i18n_validate_gettext", ) -@cmdopts([ - ("settings=", "s", "The settings to use (defaults to devstack)"), -]) @timed def i18n_compilejs(options): """ - Generating djangojs.mo file using django-statici18n + Generating djangojs.js files using django-statici18n """ - settings = options.get('settings', DEFAULT_SETTINGS) + settings = 'devstack_docker' # Generate static i18n JS files. for system in ['lms', 'cms']: diff --git a/pavelib/paver_tests/test_i18n.py b/pavelib/paver_tests/test_i18n.py index 237428d757..d17ee145dd 100644 --- a/pavelib/paver_tests/test_i18n.py +++ b/pavelib/paver_tests/test_i18n.py @@ -185,6 +185,8 @@ class TestI18nCompileJS(PaverTestCase): """ Test the "i18n_compilejs" task. """ + Env.TEST_SETTINGS = 'devstack_docker' + self.reset_task_messages() os.environ['NO_PREREQ_INSTALL'] = "true" call_task('pavelib.i18n.i18n_compilejs', options={"settings": Env.TEST_SETTINGS})