# HG changeset patch # User ymh # Date 1406683015 -7200 # Node ID a2c100af4e89b7ec67545649cd1317d5228c3bb9 # Parent 9ed21978039bfdac67e4689a69295e0fb2052955 upgrade Pillow diff -r 9ed21978039b -r a2c100af4e89 sbin/sync/fabfile.py --- a/sbin/sync/fabfile.py Wed Jul 23 17:51:23 2014 +0200 +++ b/sbin/sync/fabfile.py Wed Jul 30 03:16:55 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 9ed21978039b -r a2c100af4e89 virtualenv/res/lib/lib_create_env.py --- a/virtualenv/res/lib/lib_create_env.py Wed Jul 23 17:51:23 2014 +0200 +++ b/virtualenv/res/lib/lib_create_env.py Wed Jul 30 03:16:55 2014 +0200 @@ -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 9ed21978039b -r a2c100af4e89 virtualenv/res/src/Pillow-2.0.0.tar.gz Binary file virtualenv/res/src/Pillow-2.0.0.tar.gz has changed diff -r 9ed21978039b -r a2c100af4e89 virtualenv/res/src/Pillow-2.5.1.tar.gz Binary file virtualenv/res/src/Pillow-2.5.1.tar.gz has changed