Merge pull request #1 from diox/remove-mkt-1

Remove mkt/ stuff from Olympia, first pass (bug 973150)

apps/editors/views.py

@@ -37,8 +37,6 @@
 from users.models import UserProfile
 from zadmin.models import get_config, set_config
 
-from mkt.reviewers.utils import AppsReviewing
-
 
 def _view_on_get(request):
     """Returns whether the user can access this page.
@@ -640,8 +638,6 @@ def review_viewing(request):
     else:
         current_name = UserProfile.objects.get(pk=currently_viewing).name
 
-    AppsReviewing(request).add(addon_id)
-
     return {'current': currently_viewing, 'current_name': current_name,
             'is_user': is_user, 'interval_seconds': interval}
 

lib/settings_base.py

@@ -443,9 +443,7 @@ def JINJA_CONFIG():
     'translations',
     'users',
     'versions',
-    'mkt.webapps',
-    'mkt.collections',
-    'mkt.comm',
+    'mkt.webapps',  # FIXME
     'zadmin',
 
     # Third party apps
@@ -492,12 +490,6 @@ def JINJA_CONFIG():
             'tower.management.commands.extract.extract_tower_template'),
         ('templates/**.html',
             'tower.management.commands.extract.extract_tower_template'),
-        ('mkt/**.py',
-            'tower.management.commands.extract.extract_tower_python'),
-        ('mkt/**/templates/**.html',
-            'tower.management.commands.extract.extract_tower_template'),
-        ('mkt/templates/**.html',
-            'tower.management.commands.extract.extract_tower_template'),
         ('**/templates/**.lhtml',
             'tower.management.commands.extract.extract_tower_template'),
     ],
@@ -1090,8 +1082,8 @@ def JINJA_CONFIG():
 CELERY_SEND_TASK_ERROR_EMAILS = True
 CELERYD_HIJACK_ROOT_LOGGER = False
 CELERY_IMPORTS = ('lib.video.tasks', 'lib.metrics',
-                  'lib.es.management.commands.reindex',
-                  'lib.es.management.commands.reindex_mkt')
+                  'lib.es.management.commands.reindex')
+
 # We have separate celeryds for processing devhub & images as fast as possible
 # Some notes:
 # - always add routes here instead of @task(queue=<name>)
@@ -1107,9 +1099,6 @@ def JINJA_CONFIG():
     'bandwagon.tasks.index_collections': {'queue': 'priority'},
     'bandwagon.tasks.unindex_collections': {'queue': 'priority'},
     'lib.crypto.packaged.sign': {'queue': 'priority'},
-    'mkt.inapp_pay.tasks.fetch_product_image': {'queue': 'priority'},
-    'mkt.webapps.tasks.index_webapps': {'queue': 'priority'},
-    'mkt.webapps.tasks.unindex_webapps': {'queue': 'priority'},
     'stats.tasks.update_monolith_stats': {'queue': 'priority'},
     'users.tasks.index_users': {'queue': 'priority'},
     'users.tasks.unindex_users': {'queue': 'priority'},
@@ -1124,13 +1113,6 @@ def JINJA_CONFIG():
     'devhub.tasks.fetch_icon': {'queue': 'devhub'},
     'devhub.tasks.file_validator': {'queue': 'devhub'},
     'devhub.tasks.packager': {'queue': 'devhub'},
-    # MKT Devhub.
-    'mkt.developers.tasks.validator': {'queue': 'devhub'},
-    'mkt.developers.tasks.file_validator': {'queue': 'devhub'},
-    'mkt.developers.tasks.resize_icon': {'queue': 'devhub'},
-    'mkt.developers.tasks.resize_preview': {'queue': 'devhub'},
-    'mkt.developers.tasks.fetch_icon': {'queue': 'devhub'},
-    'mkt.developers.tasks.fetch_manifest': {'queue': 'devhub'},
 
     # Videos.
     'lib.video.tasks.resize_video': {'queue': 'devhub'},
@@ -1152,10 +1134,6 @@ def JINJA_CONFIG():
 # Otherwise your task will use the default settings.
 CELERY_TIME_LIMITS = {
     'lib.video.tasks.resize_video': {'soft': 360, 'hard': 600},
-    'lib.es.management.commands.reindex_mkt.run_indexing': {
-        'soft': 60 * 20,  # 20 mins to reindex.
-        'hard': 60 * 120,  # 120 mins hard limit.
-    },
 }
 
 # When testing, we always want tasks to raise exceptions. Good for sanity.
@@ -1635,7 +1613,7 @@ def read_only_mode(env):
 POSTFIX_DOMAIN = 'marketplace.firefox.com'
 
 # This is a sample AES_KEY, we will override this on each server.
-AES_KEYS = {
+AES_KEYS = {  # FIXME
     'api:access:secret': os.path.join(ROOT, 'mkt/api/sample-aes.key'),
 }
 

manage.py

@@ -115,10 +115,6 @@ def new(self, arg):
 newrelic_ini = getattr(django.conf.settings, 'NEWRELIC_INI', None)
 load_newrelic = False
 
-# Monkey patches DRF to not use fqdn urls.
-from mkt.api.patch import patch
-patch()
-
 if newrelic_ini:
     import newrelic.agent
     try: