# HG changeset patch
# User cavaliet
# Date 1411037932 -7200
# Node ID 5c2c1dc9a5323bb904565a30ab9f4837c3c5ab04
# Parent  06fa70ece35d86aef7f31bab8346d0d4addd62bd# Parent  7a96f86460f55e6564fe28083ab9e61982180f60
Merge with 7a96f86460f55e6564fe28083ab9e61982180f60

diff -r 06fa70ece35d -r 5c2c1dc9a532 .hgtags
--- a/.hgtags	Thu Sep 18 12:56:44 2014 +0200
+++ b/.hgtags	Thu Sep 18 12:58:52 2014 +0200
@@ -74,4 +74,10 @@
 1514d55f60a15919581181229d13654668cbd777 V02.12.08
 29bdc395eb8e6c79ec059bfe231485af3995bc19 V02.12.09
 07b0ca4a8a15af751906e5b5fa49998dc774a07d V02.12.10
+07b0ca4a8a15af751906e5b5fa49998dc774a07d V02.12.10
+a2c100af4e89b7ec67545649cd1317d5228c3bb9 V02.12.10
+a2c100af4e89b7ec67545649cd1317d5228c3bb9 V02.12.10
+4dc95dbe4102fb45c7a6705ee29439f9dce92c1a V02.12.10
+4dc95dbe4102fb45c7a6705ee29439f9dce92c1a V02.12.10
+79486a66b4b119159abd7819d63afc697d9f37de V02.12.10
 f0a6b4c4b3c0aac34f3aeb2fa32da256c5b03a18 V02.12.11
diff -r 06fa70ece35d -r 5c2c1dc9a532 sbin/sync/fabfile.py
--- a/sbin/sync/fabfile.py	Thu Sep 18 12:56:44 2014 +0200
+++ b/sbin/sync/fabfile.py	Thu Sep 18 12:58:52 2014 +0200
@@ -1,12 +1,16 @@
-from fablib import (export_version, do_sync_web, create_config, 
-    clean_export_folder, do_sync_comp, sync_install_build, do_create_virtualenv, 
-    clean_rsync_folder, rsync_export, get_comp_versions_dict, SyncComp, 
+import imp
+import os.path
+
+from fablib import (export_version, do_sync_web, create_config,
+    clean_export_folder, do_sync_comp, sync_install_build, do_create_virtualenv,
+    clean_rsync_folder, rsync_export, get_comp_versions_dict, SyncComp,
     do_relaunch_server)
 from fabric.api import task, env
 from fabric.colors import green
-import config #@UnusedImport
-import imp
-import os.path
+from fabric.tasks import execute
+
+import config  # @UnusedImport
+
 
 @task
 def relaunch_server(do_collectstatic=True, do_syncdb=True, do_check_folder_access=True):
@@ -62,7 +66,7 @@
     relaunch_server()
 
 @task
-def create_virtualenv(version):
+def create_virtualenv(version, add_dep='no'):
     print(green("create virtualenv with version %s" % version))
     export_path = export_version(web=version)
     export_path_web = os.path.join(export_path,'web')
@@ -73,6 +77,10 @@
         venv_remote_export_path = os.path.join(env.remote_path['venv_export'], env.export_prefix, version,"virtualenv")
         rsync_export(virtualenv_path, venv_remote_export_path, env.rsync_filters['venv'])
         do_create_virtualenv(venv_remote_export_path, env.remote_path['virtualenv'])
+        
+        if add_dep and add_dep.lower()[0] == 'y':
+            for sync_name in [key for key in env.repos if key != 'web']:
+                execute("sync_"+sync_name, version)
     finally:
         clean_export_folder(export_path)
         if venv_remote_export_path:
diff -r 06fa70ece35d -r 5c2c1dc9a532 virtualenv/res/lib/lib_create_env.py
--- a/virtualenv/res/lib/lib_create_env.py	Thu Sep 18 12:56:44 2014 +0200
+++ b/virtualenv/res/lib/lib_create_env.py	Thu Sep 18 12:58:52 2014 +0200
@@ -21,7 +21,7 @@
     '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-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}},
+    'DJANGO-TAGGIT-TEMPLATETAGS': { 'setup': 'django-taggit-templatetags', 'url':'https://github.com/feuervogel/django-taggit-templatetags/archive/d2216c9d1888e0739a04899a36e5149b5cbb3381.zip', 'local':"django-taggit-templatetags-d2216c9d1888e0739a04899a36e5149b5cbb3381.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}},
@@ -76,7 +76,7 @@
 
     URLS.update({
         'PSYCOPG2': {'setup': 'psycopg2','url': 'http://initd.org/psycopg/tarballs/PSYCOPG-2-5/psycopg2-2.5.tar.gz', 'local':"psycopg2-2.5.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
-        'PIL': {'setup': 'pil', 'url': 'https://github.com/python-imaging/Pillow/archive/2.0.0.tar.gz', 'local':"Pillow-2.0.0.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
+        'PIL': {'setup': 'pil', 'url': 'https://github.com/python-imaging/Pillow/archive/2.5.1.tar.gz', 'local':"Pillow-2.5.1.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
         'LXML': {'setup': 'lxml', 'url':"lxml-3.2.1.tar.bz2", 'local':"lxml-3.2.1.tar.bz2", 'install': {'method': lxml_method, 'option_str': None, 'dict_extra_env': lxml_options}},
         'MYSQL': { 'setup': 'mysql-python', 'url': 'http://downloads.sourceforge.net/project/mysql-python/mysql-python-test/1.2.4b4/MySQL-python-1.2.4b4.tar.gz', 'local':"MySQL-python-1.2.4b4.tar.gz", 'install': {'method': mysql_method, 'option_str': None, 'dict_extra_env': None}},
     })
diff -r 06fa70ece35d -r 5c2c1dc9a532 virtualenv/res/src/Pillow-2.0.0.tar.gz
Binary file virtualenv/res/src/Pillow-2.0.0.tar.gz has changed
diff -r 06fa70ece35d -r 5c2c1dc9a532 virtualenv/res/src/Pillow-2.5.1.tar.gz
Binary file virtualenv/res/src/Pillow-2.5.1.tar.gz has changed