Merge branch '0.4'

callowayproject · Jun 5, 2011 · ff6fdc3 · ff6fdc3
2 parents a77a66b + 7cefbc5
commit ff6fdc3
Show file tree

Hide file tree

Showing 49 changed files with 519 additions and 430 deletions.
diff --git a/calloway/__init__.py b/calloway/__init__.py
@@ -1,7 +1,7 @@
 __version_info__ = {
     'major': 0,
-    'minor': 3,
-    'micro': 1,
+    'minor': 4,
+    'micro': 0,
     'releaselevel': 'final',
     'serial': 1
 }

diff --git a/calloway/bin/bombay b/calloway/bin/bombay
diff --git a/calloway/bin/ext-status.sh b/calloway/bin/ext-status.sh
diff --git a/calloway/bin/generate_reqs b/calloway/bin/generate_reqs
@@ -3,48 +3,48 @@ import os
 from optparse import make_option
 
 mapping = {
-    'admin_tools': ('django-admin-tools==0.2',),
-    'admin_tools.dashboard': ('django-admin-tools==0.2',),
-    'admin_tools.menu': ('django-admin-tools==0.2',),
-    'admin_tools.theming': ('django-admin-tools==0.2',),
+    'admin_tools': ('django-admin-tools==0.4.0',),
+    'admin_tools.dashboard': ('django-admin-tools==0.4.0',),
+    'admin_tools.menu': ('django-admin-tools==0.4.0',),
+    'admin_tools.theming': ('django-admin-tools==0.4.0',),
     'ban': ('django-ban==0.1.2', 'ipcalc>=0.1', ),
-    'categories': ('django-categories==0.4.5','django-mptt-2==0.3.1', ),
+    'categories': ('django-categories==0.6','django-mptt==0.4.2', ),
     'critic': ('critic==0.1.1',),
-    'debug_toolbar': ('django-debug-toolbar==0.8.3',),
-    'django_extensions': ('django-extensions==0.5',),
-    'django_memcached': ('django-memcached==0.1.2', 'python-memcached==1.44',),
-    'editor': ('django-categories==0.4.5','django-mptt-2==0.3.1', ),
+    'debug_toolbar': ('django-debug-toolbar==0.8.5',),
+    'django_extensions': ('django-extensions==0.6',),
+    'django_memcached': ('django-memcached==0.1.2', 'python-memcached==1.47',),
+    'editor': ('django-categories==0.6','django-mptt==0.4.2', ),
     'frontendadmin': ('django-frontendadmin==0.4', 'django-livevalidation==0.1.1',),
     'google_analytics': ('google_analytics==0.2',),
-    'haystack': ('django-haystack==1.0.1-final',),
-    'hiermenu': ('hiermenu==0.1',),
+    'haystack': ('django-haystack==1.2.4',),
+    'hiermenu': ('django-hiermenu==0.2.1',),
     'livevalidation': ('django-livevalidation==0.1.1',),
-    'mailfriend': ('django-mailfriend==1.0',),
-    'massmedia': ('massmedia==0.6', 'django-tagging==0.3.1', 'IPTCInfo', 'hachoir-metadata', 'hachoir-core', 'hachoir-parser',),
+    'mailfriend': ('django-mailfriend==0.1.6',),
+    'massmedia': ('django-massmedia==0.8.3', 'django-tagging==0.3.1', 'IPTCInfo', 'hachoir-metadata', 'hachoir-core', 'hachoir-parser',),
     'memcache_status': ('django-memcache-status==1.0.1',),
-    'mptt': ('django-mptt-2==0.3.1',),
-    'mptt_comments': ('django-mptt-comments==0.1.4','django-mptt-2==0.3.1',),
-    'native_tags': ('django-native-tags==0.4',),
-    'news_sitemaps': ('django-news-sitemaps==0.1.4',),
-    'offensivecontent': ('offensivecontent==0.2.6',),
-    'pagination': ('django-pagination==1.0.9',),
+    'mptt': ('django-mptt==0.4.2',),
+    'mptt_comments': ('django-mptt-comments==0.1.4','django-mptt==0.4.2',),
+    'native_tags': ('django-native-tags==0.5.2',),
+    'news_sitemaps': ('django-news-sitemaps==0.1.6',),
+    'offensivecontent': ('offensivecontent==0.2.7',),
+    'pagination': ('django-pagination==1.1.0',),
     'piston': ('django-piston==0.2.2',),
-    'pollit': ('pollit==0.1.3',),
-    'positions': ('kamasutra==0.1.5','simplejson==2.0.9',),
+    'pollit': ('pollit==0.2.3',),
+    'positions': ('django-kamasutra==0.2.3','simplejson==2.0.9',),
     'pullquote': ('pullquote==0.1.1',),
     'registration': ('django-registration==0.8-alpha-1',),
     'reversion': ('django-reversion==1.3.1',),
     'robots': ('django-robots==0.8.0',),
-    'staff': ('django-staff==0.3.3',),
+    'staff': ('django-staff==0.5.1',),
     'staticmediamgr': ('django-staticmediamgr==0.6',),
-    'stories': ('django-stories==0.4', 'BeautifulSoup', 'pytidylib'),
+    'stories': ('django-stories==0.6.3', 'BeautifulSoup', 'pytidylib'),
     'synagg': ('django-synagg', 'feedparser==4.1', 'django-picklefield==0.1.6', 'lxml==2.2.6', 'pytidylib'),
     'tagging': ('django-tagging==0.3.1',),
     'tinymce': ('django-tinymce==1.5.1beta1',),
     'uni_form': ('django-uni-form==0.7',),
-    'varnishapp': ('django-varnish==0.1', 'python-varnish==0.1',),
+    'varnishapp': ('django-varnish==0.1', 'python-varnish==0.1.1',),
     'versionedcache': ('versionedcache==0.1.0dev',),
-    'viewpoint': ('viewpoint==0.6.8',),
+    'viewpoint': ('viewpoint==0.8.5',),
 }
 
 unknown = {
@@ -56,6 +56,7 @@ unknown = {
 
 always_required = (
 	'python-memcached==1.45',
+	'PIL',
 )
 
 def parse_req_files(req_files=()):

diff --git a/calloway/bin/install.sh b/calloway/bin/install.sh
@@ -8,13 +8,6 @@ fi
 PWD=`pwd`
 POSTACTIVATE=$VIRTUAL_ENV/bin/postactivate
 
-if [ -e externals ]; then
-    echo 'Externals link exists.'
-else
-    echo 'Creating link: externals.'
-    ln -s $VIRTUAL_ENV/src externals
-fi
-
 if [ -e $POSTACTIVATE ]; then
     echo 'Postactivate script exists.'
 else

diff --git a/calloway/bin/pull-ext.sh b/calloway/bin/pull-ext.sh
diff --git a/calloway/bin/push-ext.sh b/calloway/bin/push-ext.sh
diff --git a/calloway/default_settings.py b/calloway/default_settings.py
@@ -22,6 +22,30 @@
     os.path.join(CALLOWAY_ROOT, 'templates'),
 )
 
+APPS_DJANGO_BASE = (
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.sites',
+    'django.contrib.flatpages',
+)
+
+APPS_DJANGO13_BASE = (
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.sites',
+    'django.contrib.flatpages',
+    'django.contrib.messages',
+    'django.contrib.staticfiles',
+)
+APPS_DJANGO_TEMPLATE_UTILS = (
+    'django.contrib.humanize',
+    'django.contrib.markup',
+    'django.contrib.webdesign',
+)
+
+# APPS_CORE is deprecated
 APPS_CORE = ( # Suggested: APPS_TINYMCE, APPS_REVERSION (for flatpages)
     'django.contrib.auth',
     'django.contrib.contenttypes',
@@ -33,8 +57,11 @@
     'django.contrib.markup',
     'django.contrib.redirects',
 )
+APPS_MESSAGES = ( # Django 1.3
+    'django.contrib.messages',
+)
 APPS_ADMIN = (
-    'livevalidation', # keep me above admin
+    #'livevalidation', # keep me above admin
     'admin_tools', # for the media copying
     'admin_tools.theming', # keep me above admin
     'admin_tools.menu', # keep me above admin
@@ -58,8 +85,9 @@
     'stories',
     'positions',
     'news_sitemaps',
+)
+APPS_BLOGGING = ( # Suggested: APPS_TINYMCE, APPS_REVERSION
     'viewpoint',
-    'pullquote',
 )
 APPS_CATEGORIES = ( # Requires APPS_MPTT
     'categories',
@@ -74,8 +102,9 @@
 )
 APPS_MEDIA = (
     'massmedia',
+)
+APPS_TAGGING = (
     'tagging',
-    'staticmediamgr',
 )
 APPS_UTILS = (
     'robots',
@@ -92,6 +121,7 @@
     'mailfriend',
     'debug_toolbar',
     'pollit',
+    'pullquote',
 )
 APPS_REGISTRATION = (
     'registration',
@@ -134,8 +164,6 @@
 
 ADMIN_TOOLS_MENU = 'calloway.menu.DefaultMenu'
 
-CATEGORIES_RELATION_MODELS = ['pollit.poll',]
-
 INTERNAL_IPS = ('127.0.0.1',)
 
 STATIC_MEDIA_PURGE_OLD_FILES = False