Merge lp:~canonical-isd-hackers/canonical-identity-provider/fix-devserver into lp:canonical-identity-provider/release

Proposed by Łukasz Czyżykowski
Status: Merged
Approved by: Ricardo Kirkner
Approved revision: no longer in the source branch.
Merged at revision: 186
Proposed branch: lp:~canonical-isd-hackers/canonical-identity-provider/fix-devserver
Merge into: lp:canonical-identity-provider/release
Diff against target: 20 lines (+0/-2)
2 files modified
django_project/config_dev/config/devel-13.cfg (+0/-1)
requirements.txt (+0/-1)
To merge this branch: bzr merge lp:~canonical-isd-hackers/canonical-identity-provider/fix-devserver
Reviewer Review Type Date Requested Status
Ricardo Kirkner (community) Approve
Review via email: mp+67712@code.launchpad.net

Commit message

Fix django-devserver configuration.

Description of the change

Overview
========
This branch fixes configuration for django-devserver (for the released package on the PyPI).

To post a comment you must log in.
Revision history for this message
Ricardo Kirkner (ricardokirkner) wrote :

Agree to remove the profiler as it's not included in the stable release of devserver, and not needed most of the time. When needed we can always run the dev version locally.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'django_project/config_dev/config/devel-13.cfg'
--- django_project/config_dev/config/devel-13.cfg 2011-07-12 13:48:23 +0000
+++ django_project/config_dev/config/devel-13.cfg 2011-07-12 14:41:57 +0000
@@ -58,7 +58,6 @@
58 devserver.modules.sql.SQLSummaryModule58 devserver.modules.sql.SQLSummaryModule
59 devserver.modules.profile.ProfileSummaryModule59 devserver.modules.profile.ProfileSummaryModule
60 devserver.modules.cache.CacheSummaryModule60 devserver.modules.cache.CacheSummaryModule
61 devserver.modules.profile.LineProfilerModule
62# Modules not enabled by default61# Modules not enabled by default
63# devserver.modules.ajax.AjaxDumpModule62# devserver.modules.ajax.AjaxDumpModule
64# devserver.modules.profile.MemoryUseModule63# devserver.modules.profile.MemoryUseModule
6564
=== modified file 'requirements.txt'
--- requirements.txt 2011-07-12 13:49:01 +0000
+++ requirements.txt 2011-07-12 14:41:57 +0000
@@ -17,4 +17,3 @@
17werkzeug17werkzeug
18django-devserver==0.1.718django-devserver==0.1.7
19sqlparse==0.1.219sqlparse==0.1.2
20line_profiler==1.0b2