Fix settings compatibility.

remotes/origin/enhancement/email-actions
Andrey Antukh 2014-09-03 10:42:53 +02:00
parent a5963c77e8
commit c3c706ce5d
1 changed files with 10 additions and 10 deletions

View File

@ -298,16 +298,6 @@ PUBLIC_REGISTER_ENABLED = False
SEARCHES_MAX_RESULTS = 150
# NOTE: DON'T INSERT MORE SETTINGS AFTER THIS LINE
#TEST_RUNNER="django.test.runner.DiscoverRunner"
# Test conditions
if "test" in sys.argv:
print ("\033[1;91mNo django tests.\033[0m")
print ("Try: \033[1;33mpy.test\033[0m")
sys.exit(0)
SOUTH_MIGRATION_MODULES = {
'easy_thumbnails': 'easy_thumbnails.south_migrations',
}
@ -342,3 +332,13 @@ TAGS_PREDEFINED_COLORS = ["#fce94f", "#edd400", "#c4a000", "#8ae234",
"#204a87", "#888a85", "#ad7fa8", "#75507b",
"#5c3566", "#ef2929", "#cc0000", "#a40000",
"#2e3436",]
# NOTE: DON'T INSERT MORE SETTINGS AFTER THIS LINE
TEST_RUNNER="django.test.runner.DiscoverRunner"
if "test" in sys.argv:
print ("\033[1;91mNo django tests.\033[0m")
print ("Try: \033[1;33mpy.test\033[0m")
sys.exit(0)