# HG changeset patch # User ymh # Date 1361486655 -3600 # Node ID 35eb0cbadae07322f5fd0dc45b5eb17a6b01501b # Parent 3820e8d1316d0b773225cb19d3aea7321a7949e6 update fablib diff -r 3820e8d1316d -r 35eb0cbadae0 .pydevproject --- a/.pydevproject Thu Feb 21 17:55:58 2013 +0100 +++ b/.pydevproject Thu Feb 21 23:44:15 2013 +0100 @@ -1,6 +1,6 @@ -Default +python_fablib python 2.7 /fablib/src diff -r 3820e8d1316d -r 35eb0cbadae0 src/fablib/core.py --- a/src/fablib/core.py Thu Feb 21 17:55:58 2013 +0100 +++ b/src/fablib/core.py Thu Feb 21 23:44:15 2013 +0100 @@ -5,12 +5,11 @@ @author: ymh ''' from fabric.api import run, local, env, cd, put, prefix, sudo, lcd +from fabric.colors import green from fabric.context_managers import settings from fabric.contrib.files import exists, upload_template from fabric.contrib.project import rsync_project -from mercurial import commands, ui, hg, cmdutil from fabric.tasks import Task -from fabric.colors import green import imp import os.path import re @@ -18,9 +17,9 @@ import urlparse -__all__ = ["check_folder_access", "syncdb", "collectstatic", - "export_version", "do_sync_web", "create_config", "clean_export_folder", "relaunch_server", - "do_sync_ldt", "sync_install_build", "do_create_virtualenv", "clean_rsync_folder", "rsync_export", +__all__ = ["check_folder_access", "syncdb", "collectstatic", "do_relaunch_server", + "export_version", "do_sync_web", "create_config", "clean_export_folder", + "sync_install_build", "do_create_virtualenv", "clean_rsync_folder", "rsync_export", "SyncComp"] def get_export_path(version): @@ -57,7 +56,7 @@ def get_remote_env(remotepath, remotevirtualenvpath, platform_web_module, settings_key): activate_path = os.path.join(remotevirtualenvpath, "bin/activate") with prefix("source \"%s\"" % activate_path), prefix("export PYTHONPATH=\"%s\"" % remotepath), cd(remotepath): - tempfilepath = run("mktemp -t ldtplatform.XXXXXX") + tempfilepath = run("mktemp -t fablib.XXXXXX") with settings(warn_only=True): run("echo \"import os\" > %s" % (tempfilepath)) map(lambda str_echo: run("echo \"%s\" >> %s" % (str_echo, tempfilepath)), @@ -246,8 +245,8 @@ with settings(warn_only=True): if not exists(folder_path): run("mkdir -p \"%s\"" % folder_path) - run("chown -R -c :%s \"%s\"" % (env.web_group, folder_path)) - run("chmod -R -c g+w \"%s\"" % folder_path) + run("chown -R :%s \"%s\"" % (env.web_group, folder_path)) + run("chmod -R g+w \"%s\"" % folder_path) def get_comp_versions_dict(export_path_web): comp_versions = {} diff -r 3820e8d1316d -r 35eb0cbadae0 src/setup.py --- a/src/setup.py Thu Feb 21 17:55:58 2013 +0100 +++ b/src/setup.py Thu Feb 21 23:44:15 2013 +0100 @@ -34,5 +34,6 @@ author_email='dev@iri.centrepompidou.fr', url='http://www.iri.centrepompidou.fr', packages=['fablib'], - data_files=[('','README.rst')] + data_files=[('','README.rst')], + requires=["fabric(>1.5)", "mercurial(>=2.5)"] ) \ No newline at end of file