From 9239253614bcfa65504d29a3024e45dc55976599 Mon Sep 17 00:00:00 2001 From: Renzo Lucioni Date: Fri, 12 Sep 2014 12:07:54 -0400 Subject: [PATCH] Remove Django Waffle --- common/djangoapps/embargo/tests/test_middleware.py | 4 ++-- lms/envs/common.py | 14 -------------- lms/templates/courseware/course_navigation.html | 5 ----- lms/templates/courseware/welcome-back.html | 1 - lms/urls.py | 2 -- requirements/edx/github.txt | 1 - 6 files changed, 2 insertions(+), 25 deletions(-) diff --git a/common/djangoapps/embargo/tests/test_middleware.py b/common/djangoapps/embargo/tests/test_middleware.py index 5407b8bde1..42c5de0cca 100644 --- a/common/djangoapps/embargo/tests/test_middleware.py +++ b/common/djangoapps/embargo/tests/test_middleware.py @@ -260,12 +260,12 @@ class EmbargoMiddlewareTests(ModuleStoreTestCase): profile.save() # Warm the cache - with self.assertNumQueries(18): + with self.assertNumQueries(14): self.client.get(self.embargoed_page) # Access the page multiple times, but expect that we hit # the database to check the user's profile only once - with self.assertNumQueries(12): + with self.assertNumQueries(8): self.client.get(self.embargoed_page) def test_embargo_profile_country_db_null(self): diff --git a/lms/envs/common.py b/lms/envs/common.py index e24f5da2c4..2c5d6cadd7 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -837,14 +837,6 @@ JASMINE_TEST_DIRECTORY = PROJECT_ROOT + '/static/coffee' # Ignore deprecation warnings (so we don't clutter Jenkins builds/production) simplefilter('ignore') -################################# Waffle ################################### - -# Name prepended to cookies set by Waffle -WAFFLE_COOKIE = "waffle_flag_%s" - -# Two weeks (in sec) -WAFFLE_MAX_AGE = 1209600 - ################################# Middleware ################################### # List of finder classes that know how to find static files in # various locations. @@ -910,9 +902,6 @@ MIDDLEWARE_CLASSES = ( # needs to run after locale middleware (or anything that modifies the request context) 'edxmako.middleware.MakoMiddleware', - # For A/B testing - 'waffle.middleware.WaffleMiddleware', - # for expiring inactive sessions 'session_inactivity_timeout.middleware.SessionInactivityTimeout', @@ -1331,9 +1320,6 @@ INSTALLED_APPS = ( # Foldit integration 'foldit', - # For A/B testing - 'waffle', - # For testing 'django.contrib.admin', # only used in DEBUG mode 'django_nose', diff --git a/lms/templates/courseware/course_navigation.html b/lms/templates/courseware/course_navigation.html index 1ec271aacc..bff88e1464 100644 --- a/lms/templates/courseware/course_navigation.html +++ b/lms/templates/courseware/course_navigation.html @@ -18,7 +18,6 @@ def url_class(is_active): <%! from django.core.urlresolvers import reverse %> <%! from django.utils.translation import ugettext as _ %> <%! from courseware.views import notification_image_for_tab %> -<% import waffle %> % if disable_tabs is UNDEFINED or not disable_tabs: