Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2650 from edx/zoldak/dbt-onto-release

Browse Source 
Rollback Django Debug Toolbar from 1.0.1 to 0.9.4
This commit is contained in:
Jay Zoldak
2014-02-19 15:46:35 -05:00
parent 3d2b1df637 f375368caa
commit 9986a664bb
8 changed files with 61 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cms/envs/dev.py
View File

@@ -160,7 +160,7 @@ DEBUG_TOOLBAR_PANELS = (
# Django=1.3.1/1.4 where requests to views get duplicated (your method gets # Django=1.3.1/1.4 where requests to views get duplicated (your method gets
# hit twice). So you can uncomment when you need to diagnose performance # hit twice). So you can uncomment when you need to diagnose performance
# problems, but you shouldn't leave it on. # problems, but you shouldn't leave it on.
# 'debug_toolbar.panels.profiling.ProfilingPanel', # 'debug_toolbar.panels.profiling.ProfilingDebugPanel',
) )
DEBUG_TOOLBAR_CONFIG = { DEBUG_TOOLBAR_CONFIG = {

20
cms/envs/dev_dbperf.py
View File

@@ -9,21 +9,21 @@ This configuration is to turn on the Django Toolbar stats for DB access stats, f
from .dev import * from .dev import *
DEBUG_TOOLBAR_PANELS = ( DEBUG_TOOLBAR_PANELS = (
'debug_toolbar.panels.versions.VersionsPanel', 'debug_toolbar.panels.version.VersionDebugPanel',
'debug_toolbar.panels.timer.TimerPanel', 'debug_toolbar.panels.timer.TimerDebugPanel',
'debug_toolbar.panels.settings.SettingsPanel', 'debug_toolbar.panels.settings_vars.SettingsVarsDebugPanel',
'debug_toolbar.panels.headers.HeadersPanel', 'debug_toolbar.panels.headers.HeaderDebugPanel',
'debug_toolbar.panels.request.RequestPanel', 'debug_toolbar.panels.request_vars.RequestVarsDebugPanel',
'debug_toolbar.panels.sql.SQLPanel', 'debug_toolbar.panels.sql.SQLDebugPanel',
'debug_toolbar.panels.signals.SignalsPanel', 'debug_toolbar.panels.signals.SignalDebugPanel',
'debug_toolbar.panels.logging.LoggingPanel', 'debug_toolbar.panels.logger.LoggingPanel',
'debug_toolbar_mongo.panel.MongoDebugPanel', 'debug_toolbar_mongo.panel.MongoDebugPanel'
# Enabling the profiler has a weird bug as of django-debug-toolbar==0.9.4 and # Enabling the profiler has a weird bug as of django-debug-toolbar==0.9.4 and
# Django=1.3.1/1.4 where requests to views get duplicated (your method gets # Django=1.3.1/1.4 where requests to views get duplicated (your method gets
# hit twice). So you can uncomment when you need to diagnose performance # hit twice). So you can uncomment when you need to diagnose performance
# problems, but you shouldn't leave it on. # problems, but you shouldn't leave it on.
# 'debug_toolbar.panels.profiling.ProfilingPanel', # 'debug_toolbar.panels.profiling.ProfilingDebugPanel',
) )
# To see stacktraces for MongoDB queries, set this to True. # To see stacktraces for MongoDB queries, set this to True.

16
cms/envs/devstack.py
View File

@@ -37,14 +37,14 @@ MIDDLEWARE_CLASSES += ('debug_toolbar.middleware.DebugToolbarMiddleware',)
INTERNAL_IPS = ('127.0.0.1',) INTERNAL_IPS = ('127.0.0.1',)
DEBUG_TOOLBAR_PANELS = ( DEBUG_TOOLBAR_PANELS = (
'debug_toolbar.panels.versions.VersionsPanel', 'debug_toolbar.panels.version.VersionDebugPanel',
'debug_toolbar.panels.timer.TimerPanel', 'debug_toolbar.panels.timer.TimerDebugPanel',
'debug_toolbar.panels.settings.SettingsPanel', 'debug_toolbar.panels.settings_vars.SettingsVarsDebugPanel',
'debug_toolbar.panels.headers.HeadersPanel', 'debug_toolbar.panels.headers.HeaderDebugPanel',
'debug_toolbar.panels.request.RequestPanel', 'debug_toolbar.panels.request_vars.RequestVarsDebugPanel',
'debug_toolbar.panels.sql.SQLPanel', 'debug_toolbar.panels.sql.SQLDebugPanel',
'debug_toolbar.panels.signals.SignalsPanel', 'debug_toolbar.panels.signals.SignalDebugPanel',
'debug_toolbar.panels.logging.LoggingPanel', 'debug_toolbar.panels.logger.LoggingPanel',
# Enabling the profiler has a weird bug as of django-debug-toolbar==0.9.4 and # Enabling the profiler has a weird bug as of django-debug-toolbar==0.9.4 and
# Django=1.3.1/1.4 where requests to views get duplicated (your method gets # Django=1.3.1/1.4 where requests to views get duplicated (your method gets

19
lms/envs/content.py
View File

@@ -19,19 +19,18 @@ INSTALLED_APPS += ('debug_toolbar',)
MIDDLEWARE_CLASSES += ('debug_toolbar.middleware.DebugToolbarMiddleware',) MIDDLEWARE_CLASSES += ('debug_toolbar.middleware.DebugToolbarMiddleware',)
DEBUG_TOOLBAR_PANELS = ( DEBUG_TOOLBAR_PANELS = (
'debug_toolbar.panels.versions.VersionsPanel', 'debug_toolbar.panels.version.VersionDebugPanel',
'debug_toolbar.panels.timer.TimerPanel', 'debug_toolbar.panels.timer.TimerDebugPanel',
'debug_toolbar.panels.settings.SettingsPanel', 'debug_toolbar.panels.settings_vars.SettingsVarsDebugPanel',
'debug_toolbar.panels.headers.HeadersPanel', 'debug_toolbar.panels.headers.HeaderDebugPanel',
'debug_toolbar.panels.request.RequestPanel', 'debug_toolbar.panels.request_vars.RequestVarsDebugPanel',
'debug_toolbar.panels.sql.SQLPanel', 'debug_toolbar.panels.sql.SQLDebugPanel',
'debug_toolbar.panels.signals.SignalsPanel', 'debug_toolbar.panels.signals.SignalDebugPanel',
'debug_toolbar.panels.logging.LoggingPanel', 'debug_toolbar.panels.logger.LoggingPanel',
# Enabling the profiler has a weird bug as of django-debug-toolbar==0.9.4 and # Enabling the profiler has a weird bug as of django-debug-toolbar==0.9.4 and
# Django=1.3.1/1.4 where requests to views get duplicated (your method gets # Django=1.3.1/1.4 where requests to views get duplicated (your method gets
# hit twice). So you can uncomment when you need to diagnose performance # hit twice). So you can uncomment when you need to diagnose performance
# problems, but you shouldn't leave it on. # problems, but you shouldn't leave it on.
# 'debug_toolbar.panels.profiling.ProfilingPanel', # 'debug_toolbar.panels.profiling.ProfilingDebugPanel',
) )

2
lms/envs/dev.py
View File

@@ -230,7 +230,7 @@ DEBUG_TOOLBAR_PANELS = (
# Django=1.3.1/1.4 where requests to views get duplicated (your method gets # Django=1.3.1/1.4 where requests to views get duplicated (your method gets
# hit twice). So you can uncomment when you need to diagnose performance # hit twice). So you can uncomment when you need to diagnose performance
# problems, but you shouldn't leave it on. # problems, but you shouldn't leave it on.
# 'debug_toolbar.panels.profiling.ProfilingPanel', # 'debug_toolbar.panels.profiling.ProfilingDebugPanel',
) )
DEBUG_TOOLBAR_CONFIG = { DEBUG_TOOLBAR_CONFIG = {

18
lms/envs/devplus.py
View File

@@ -57,20 +57,20 @@ MIDDLEWARE_CLASSES += ('debug_toolbar.middleware.DebugToolbarMiddleware',)
INTERNAL_IPS = ('127.0.0.1',) INTERNAL_IPS = ('127.0.0.1',)
DEBUG_TOOLBAR_PANELS = ( DEBUG_TOOLBAR_PANELS = (
'debug_toolbar.panels.versions.VersionsPanel', 'debug_toolbar.panels.version.VersionDebugPanel',
'debug_toolbar.panels.timer.TimerPanel', 'debug_toolbar.panels.timer.TimerDebugPanel',
'debug_toolbar.panels.settings.SettingsPanel', 'debug_toolbar.panels.settings_vars.SettingsVarsDebugPanel',
'debug_toolbar.panels.headers.HeadersPanel', 'debug_toolbar.panels.headers.HeaderDebugPanel',
'debug_toolbar.panels.request.RequestPanel', 'debug_toolbar.panels.request_vars.RequestVarsDebugPanel',
'debug_toolbar.panels.sql.SQLPanel', 'debug_toolbar.panels.sql.SQLDebugPanel',
'debug_toolbar.panels.signals.SignalsPanel', 'debug_toolbar.panels.signals.SignalDebugPanel',
'debug_toolbar.panels.logging.LoggingPanel', 'debug_toolbar.panels.logger.LoggingPanel',
# Enabling the profiler has a weird bug as of django-debug-toolbar==0.9.4 and # Enabling the profiler has a weird bug as of django-debug-toolbar==0.9.4 and
# Django=1.3.1/1.4 where requests to views get duplicated (your method gets # Django=1.3.1/1.4 where requests to views get duplicated (your method gets
# hit twice). So you can uncomment when you need to diagnose performance # hit twice). So you can uncomment when you need to diagnose performance
# problems, but you shouldn't leave it on. # problems, but you shouldn't leave it on.
'debug_toolbar.panels.profiling.ProfilingPanel', 'debug_toolbar.panels.profiling.ProfilingDebugPanel',
) )
#PIPELINE = True #PIPELINE = True

26
lms/envs/devstack.py
View File

@@ -35,20 +35,20 @@ MIDDLEWARE_CLASSES += ('django_comment_client.utils.QueryCountDebugMiddleware',
INTERNAL_IPS = ('127.0.0.1',) INTERNAL_IPS = ('127.0.0.1',)
DEBUG_TOOLBAR_PANELS = ( DEBUG_TOOLBAR_PANELS = (
'debug_toolbar.panels.versions.VersionsPanel', 'debug_toolbar.panels.version.VersionDebugPanel',
'debug_toolbar.panels.timer.TimerPanel', 'debug_toolbar.panels.timer.TimerDebugPanel',
'debug_toolbar.panels.settings.SettingsPanel', 'debug_toolbar.panels.settings_vars.SettingsVarsDebugPanel',
'debug_toolbar.panels.headers.HeadersPanel', 'debug_toolbar.panels.headers.HeaderDebugPanel',
'debug_toolbar.panels.request.RequestPanel', 'debug_toolbar.panels.request_vars.RequestVarsDebugPanel',
'debug_toolbar.panels.sql.SQLPanel', 'debug_toolbar.panels.sql.SQLDebugPanel',
'debug_toolbar.panels.signals.SignalsPanel', 'debug_toolbar.panels.signals.SignalDebugPanel',
'debug_toolbar.panels.logging.LoggingPanel', 'debug_toolbar.panels.logger.LoggingPanel',
# Enabling the profiler has a weird bug as of django-debug-toolbar==0.9.4 and # Enabling the profiler has a weird bug as of django-debug-toolbar==0.9.4 and
# Django=1.3.1/1.4 where requests to views get duplicated (your method gets # Django=1.3.1/1.4 where requests to views get duplicated (your method gets
# hit twice). So you can uncomment when you need to diagnose performance # hit twice). So you can uncomment when you need to diagnose performance
# problems, but you shouldn't leave it on. # problems, but you shouldn't leave it on.
# 'debug_toolbar.panels.profiling.ProfilingPanel', # 'debug_toolbar.panels.profiling.ProfilingPanel',
) )
DEBUG_TOOLBAR_CONFIG = { DEBUG_TOOLBAR_CONFIG = {

12
requirements/edx/base.txt
View File

@@ -93,12 +93,20 @@ sphinx_rtd_theme==0.1.5
Babel==1.3 Babel==1.3
transifex-client==0.10 transifex-client==0.10
# We've tried several times to update the debug toolbar to version 1.0.1,
# and had problems each time, resulting in us rolling back to 0.9.4. Before
# submitting another pull request to do this update, check the following:
# * https://github.com/django-debug-toolbar/django-debug-toolbar/issues/535 should be resolved
# * Studio and CMS should both run correctly, both directly and via devstack
# * Check the Javascript console to be sure there are no Javascript errors
# related to the Django debug toolbar
django_debug_toolbar==0.9.4
django-debug-toolbar-mongo
# Used for testing # Used for testing
coverage==3.7 coverage==3.7
ddt==0.6.0 ddt==0.6.0
django-crum==0.5 django-crum==0.5
django-debug-toolbar-mongo
django_debug_toolbar==1.0.1
django_nose==1.1 django_nose==1.1
factory_boy==2.2.1 factory_boy==2.2.1
freezegun==0.1.11 freezegun==0.1.11