From 7896779ff18b304f8246c24123b8cbf9b82ec5b0 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Fri, 23 Mar 2012 17:46:10 -0500 Subject: Bump requirements to Django 1.4 and add new manage.py The default manage.py script has been updated in Django 1.4, and the old version and functions it calls is deprecated. Signed-off-by: Dan McGee --- manage.py | 16 ++++++---------- requirements.txt | 6 +++--- requirements_prod.txt | 6 +++--- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/manage.py b/manage.py index 317dd15..debb55e 100755 --- a/manage.py +++ b/manage.py @@ -1,16 +1,12 @@ #!/usr/bin/env python2 +import os +import sys -from django.core.management import execute_manager +if __name__ == "__main__": + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings") -try: - import settings # Assumed to be in the same directory. -except ImportError: - import sys - sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n" % __file__) - sys.exit(1) + from django.core.management import execute_from_command_line -if __name__ == "__main__": - execute_manager(settings) + execute_from_command_line(sys.argv) # vim: set ts=4 sw=4 et: - diff --git a/requirements.txt b/requirements.txt index 83355a9..1c1578c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ -Django==1.3.1 +Django==1.4 Markdown==2.1.1 -South==0.7.3 +South==0.7.4 pgpdump==1.1 -pytz>=2011n +pytz>=2012b diff --git a/requirements_prod.txt b/requirements_prod.txt index ebac73c..7f7663a 100644 --- a/requirements_prod.txt +++ b/requirements_prod.txt @@ -1,8 +1,8 @@ -Django==1.3.1 +Django==1.4 Markdown==2.1.1 MySQL-python==1.2.3 -South==0.7.3 +South==0.7.4 pgpdump==1.1 pyinotify==0.9.3 python-memcached==1.48 -pytz>=2011n +pytz>=2012b -- cgit v1.2.3-24-g4f1b