summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2012-03-23 17:46:10 -0500
committerDan McGee <dan@archlinux.org>2012-03-23 19:54:40 -0500
commit7896779ff18b304f8246c24123b8cbf9b82ec5b0 (patch)
treeb7812b60d3b2eb7ed23824a505c878c0176415a2
parent99da2f78b8fbc2577f82895074ae868683e0ed5e (diff)
downloadarchweb-7896779ff18b304f8246c24123b8cbf9b82ec5b0.tar.gz
archweb-7896779ff18b304f8246c24123b8cbf9b82ec5b0.zip
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 <dan@archlinux.org>
-rwxr-xr-xmanage.py16
-rw-r--r--requirements.txt6
-rw-r--r--requirements_prod.txt6
3 files changed, 12 insertions, 16 deletions
diff --git a/manage.py b/manage.py
index 317dd156..debb55e5 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 83355a9e..1c1578cb 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 ebac73ca..7f7663a8 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