# HG changeset patch
# User cavaliet
# Date 1397139254 -7200
# Node ID e809ae17472a2f943b3d556d1ee76d437647269f
# Parent  2c7aef21c67c0e938065245ea4c62da29d4ba0ca
V.2.12 : requires ldt v1.53, remove tagging, add taggit

diff -r 2c7aef21c67c -r e809ae17472a src/ldtplatform/__init__.py
--- a/src/ldtplatform/__init__.py	Thu Apr 03 16:00:08 2014 +0200
+++ b/src/ldtplatform/__init__.py	Thu Apr 10 16:14:14 2014 +0200
@@ -1,4 +1,4 @@
-VERSION = (2, 11, 22, "final", 0)
+VERSION = (2, 12, 0, "final", 0)
 
 VERSION_STR = unicode(".".join(map(lambda i:"%02d" % (i,), VERSION[:2])))
 
diff -r 2c7aef21c67c -r e809ae17472a src/ldtplatform/settings.py
--- a/src/ldtplatform/settings.py	Thu Apr 03 16:00:08 2014 +0200
+++ b/src/ldtplatform/settings.py	Thu Apr 10 16:14:14 2014 +0200
@@ -131,7 +131,8 @@
     'haystack',
     'tastypie',
     'guardian',
-    'tagging',
+    'taggit',
+    'taggit_templatetags',
     'registration',
     'oauth_provider',
     'django_openid_consumer',
@@ -278,5 +279,5 @@
 MAX_TAG_LENGTH = 255
 FORCE_LOWERCASE_TAGS = True
 
-    
-  
+TAGGIT_TAGCLOUD_MIN = 1.0
+TAGGIT_TAGCLOUD_MAX = 12.0
diff -r 2c7aef21c67c -r e809ae17472a src/requirement.txt
--- a/src/requirement.txt	Thu Apr 03 16:00:08 2014 +0200
+++ b/src/requirement.txt	Thu Apr 10 16:14:14 2014 +0200
@@ -1,3 +1,3 @@
-ldt (==1.52.7)
+ldt (==1.53)
 hashcut (==0.13)
 metadatacomposer (==0.1.17)
\ No newline at end of file
diff -r 2c7aef21c67c -r e809ae17472a virtualenv/res/lib/lib_create_env.py
--- a/virtualenv/res/lib/lib_create_env.py	Thu Apr 03 16:00:08 2014 +0200
+++ b/virtualenv/res/lib/lib_create_env.py	Thu Apr 10 16:14:14 2014 +0200
@@ -20,7 +20,8 @@
     'DJANGO': {'setup': 'django', 'url': 'https://github.com/IRI-Research/django/archive/1.5.5+IRI.tar.gz', 'local':"django-1.5.5-IRI.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
     'DJANGO-EXTENSIONS': { 'setup': 'django-extensions', 'url':'https://github.com/django-extensions/django-extensions/archive/1.1.1.tar.gz', 'local':"django-extensions-1.1.1.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
     'DJANGO-REGISTRATION': { 'setup': 'django-registration', 'url':'https://bitbucket.org/IRI/django-registration/get/tip.tar.gz', 'local':"IRI-django-registration-e23626c256c0.tar.gz", 'install': {'method': 'easy_install', 'option_str': '-Z', 'dict_extra_env': None}},
-    'DJANGO-TAGGING': { 'setup': 'django-tagging', 'url':'http://django-tagging.googlecode.com/files/django-tagging-0.3.1.tar.gz', 'local':"django-tagging-0.3.1.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
+    'DJANGO-TAGGIT': { 'setup': 'django-taggit', 'url':'https://github.com/alex/django-taggit/archive/0.11.2.tar.gz', 'local':"django-taggit-0.11.2.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
+    'DJANGO-TAGGIT-TEMPLATETAGS': { 'setup': 'django-taggit-templatetags', 'url':'https://github.com/feuervogel/django-taggit-templatetags/archive/d2216c9d1888e0739a04899a36e5149b5cbb3381.zip', 'local':"django-taggit-a38ee9d8913e05b1993f90c358be5f5397f529eb.zip", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
     'OAUTH2': { 'setup': 'python-oauth2', 'url':"https://github.com/simplegeo/python-oauth2/tarball/hudson-python-oauth2-211", 'local':"oauth2-1.5.211.tar.gz", 'install': {'method': 'easy_install', 'option_str': None, 'dict_extra_env': None}},
     'HTTPLIB2': { 'setup': 'python-httplib2', 'url':'https://httplib2.googlecode.com/files/httplib2-0.8.tar.gz', 'local':"httplib2-0.8.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
     'DJANGO-OAUTH-PLUS': { 'setup': 'django-oauth-plus', 'url':'https://pypi.python.org/packages/source/d/django-oauth-plus/django-oauth-plus-2.1.0.tar.gz', 'local':"django-oauth-plus-2.1.0.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
diff -r 2c7aef21c67c -r e809ae17472a virtualenv/res/src/django-tagging-0.3.1.tar.gz
Binary file virtualenv/res/src/django-tagging-0.3.1.tar.gz has changed
diff -r 2c7aef21c67c -r e809ae17472a virtualenv/res/src/django-taggit-0.11.2.tar.gz
Binary file virtualenv/res/src/django-taggit-0.11.2.tar.gz has changed
diff -r 2c7aef21c67c -r e809ae17472a virtualenv/res/src/django-taggit-templatetags-d2216c9d1888e0739a04899a36e5149b5cbb3381.zip
Binary file virtualenv/res/src/django-taggit-templatetags-d2216c9d1888e0739a04899a36e5149b5cbb3381.zip has changed
diff -r 2c7aef21c67c -r e809ae17472a virtualenv/web/res/res_create_env.py
--- a/virtualenv/web/res/res_create_env.py	Thu Apr 03 16:00:08 2014 +0200
+++ b/virtualenv/web/res/res_create_env.py	Thu Apr 10 16:14:14 2014 +0200
@@ -14,7 +14,8 @@
     'DJANGO',
     'DJANGO-EXTENSIONS',
     'DJANGO-REGISTRATION',
-    'DJANGO-TAGGING',
+    'DJANGO-TAGGIT',
+    'DJANGO-TAGGIT-TEMPLATETAGS',
     'HTTPLIB2',
     'OAUTH2',
     'SETUPTOOLS_HG',