Reverted to [9025] because commit [9026] failed (it was incomplete with a broken working dir).

 - Legacy-Id: 9027
Note: SVN reference [9026] has been migrated to Git commit 4a3749a

Author: levkowetz

bin/graph-models

@@ -5,8 +5,7 @@
 # Requires modelviz.py from
 #  http://code.djangoproject.com/wiki/DjangoGraphviz
 #
-cd ${0%/*}/../ietf
-PYTHONPATH=`dirname $PWD`:`dirname $PWD/..`
+PYTHONPATH=`dirname $PWD`
 export PYTHONPATH
 module=${PWD##*/}
 DJANGO_SETTINGS_MODULE=$module.settings
@@ -19,4 +18,4 @@ do
 	fi
 done
 modelviz.py $* $models > models.dot
-dot -Tpng models.dot > models.png
+dot -Tpng models.dot

bin/test-crawl

@@ -25,7 +25,6 @@ settings_module = args.settings or "ietf.settings"
 
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", settings_module)
 
-import django
 import django.test
 
 # prevent memory from leaking when settings.DEBUG=True
@@ -78,7 +77,6 @@ def extract_html_urls(content):
 
         yield url
 
-django.setup()
 client = django.test.Client()
 
 for url in initial_urls:

changelog

@@ -1,20 +1,3 @@
-ietfdb (5.11.0) ietf; urgency=medium
-
-  This relese upgrades Django from 1.6.4 to 1.7.1, and tastypie from 0.11.1 to
-  0.12.1.  It changes the database migrations infrastructure from that provided
-  by "south", to the builtin replacement newly introduced with Django 1.7.
-
-  There are also a set of changes required by the upgrade, and some fixes
-  to bugs revealed by the improved infrastructure provided by Django 1.7.
-
-  Deployment note:  When deploying this, migrations need some extra care.
-  You should run the following:
-	$ ietf/manage.py migrate --fake doc
-	$ ietf/manage.py migrate --fake community
-	$ ietf/manage.py migrate --fake dbtemplate
-	$ ietf/manage.py migrate
-
-
 ietfdb (5.10.3) ietf; urgency=medium
 
   This is a minor bugfix release in preparation for the upcoming upgrade from

django/__init__.py

@@ -1,21 +1,7 @@
-VERSION = (1, 7, 4, 'final', 0)
-
+VERSION = (1, 6, 0, 'final', 0)
 
 def get_version(*args, **kwargs):
     # Don't litter django/__init__.py with all the get_version stuff.
     # Only import if it's actually called.
     from django.utils.version import get_version
     return get_version(*args, **kwargs)
-
-
-def setup():
-    """
-    Configure the settings (this happens as a side effect of accessing the
-    first setting), configure logging and populate the app registry.
-    """
-    from django.apps import apps
-    from django.conf import settings
-    from django.utils.log import configure_logging
-
-    configure_logging(settings.LOGGING_CONFIG, settings.LOGGING)
-    apps.populate(settings.INSTALLED_APPS)