--- a/conf/config.py.tmpl Thu Jan 09 14:20:48 2014 +0100
+++ b/conf/config.py.tmpl Wed Mar 26 15:32:32 2014 +0100
@@ -51,3 +51,5 @@
},
}
+env.check_folder_access = True
+
--- a/conf/fabfile.py Thu Jan 09 14:20:48 2014 +0100
+++ b/conf/fabfile.py Wed Mar 26 15:32:32 2014 +0100
@@ -1,17 +1,20 @@
-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.api import task, env
+from fabric.colors import green
+
+import config # @UnusedImport
+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)
+
+
@task
-def relaunch_server(do_collectstatic=True, do_syncdb=True):
+def relaunch_server(do_collectstatic=True, do_syncdb=True, do_check_folder_access=True):
print("Relaunch server")
- do_relaunch_server(do_collectstatic, do_syncdb)
+ do_relaunch_server(do_collectstatic, do_syncdb, env.get('check_folder_access',do_check_folder_access))
@task
def sync_web(version):
--- a/src/fablib/core.py Thu Jan 09 14:20:48 2014 +0100
+++ b/src/fablib/core.py Wed Mar 26 15:32:32 2014 +0100
@@ -330,8 +330,9 @@
return comp_versions
-def do_relaunch_server(do_collectstatic, do_syncdb):
- check_folder_access()
+def do_relaunch_server(do_collectstatic, do_syncdb, do_check_folder_access):
+ if do_check_folder_access:
+ check_folder_access()
if do_syncdb:
syncdb(env.remote_path['src'], env.remote_path['virtualenv'])
if do_collectstatic:
@@ -361,4 +362,4 @@
clean_export_folder(export_path)
clean_export_folder(export_path_web)
- do_relaunch_server(do_collectstatic=True, do_syncdb=True)
+ do_relaunch_server(do_collectstatic=True, do_syncdb=True, do_check_folder_access=True)
--- a/virtualenv/fablib/res/requirement.txt Thu Jan 09 14:20:48 2014 +0100
+++ b/virtualenv/fablib/res/requirement.txt Wed Mar 26 15:32:32 2014 +0100
@@ -1,5 +1,5 @@
#pip install -f <path_to>/virtualenv/res/src --no-index -r requirement.txt
-Fabric==1.8.1
+Fabric==1.8.3
ecdsa==0.10
mercurial==2.8.2
paramiko==1.12.0
--- a/virtualenv/fablib/virtualenv.py Thu Jan 09 14:20:48 2014 +0100
+++ b/virtualenv/fablib/virtualenv.py Wed Mar 26 15:32:32 2014 +0100
@@ -2,7 +2,7 @@
"""Create a "virtual" Python installation
"""
-__version__ = "1.11"
+__version__ = "1.11.4"
virtualenv_version = __version__ # legacy
import base64
@@ -286,7 +286,11 @@
#"zipfile",
])
if minver >= 4:
- REQUIRED_MODULES.extend(['operator', '_collections_abc'])
+ REQUIRED_MODULES.extend([
+ 'operator',
+ '_collections_abc',
+ '_bootlocale',
+ ])
if is_pypy:
# these are needed to correctly display the exceptions that may happen
@@ -942,7 +946,7 @@
cmd = [
py_executable, '-c',
- 'import sys, pip; pip.main(["install"] + sys.argv[1:])',
+ 'import sys, pip; sys.exit(pip.main(["install", "--ignore-installed"] + sys.argv[1:]))',
] + project_names
logger.start_progress('Installing %s...' % (', '.join(project_names)))
logger.indent += 2
@@ -1246,7 +1250,7 @@
# OS X framework builds cause validation to break
# https://github.com/pypa/virtualenv/issues/322
if os.environ.get('__PYVENV_LAUNCHER__'):
- os.unsetenv('__PYVENV_LAUNCHER__')
+ del os.environ["__PYVENV_LAUNCHER__"]
if re.search(r'/Python(?:-32|-64)*$', py_executable):
# The name of the python executable is not quite what
# we want, rename it.
Binary file virtualenv/fablib/virtualenv_support/pip-1.5-py2.py3-none-any.whl has changed
Binary file virtualenv/fablib/virtualenv_support/pip-1.5.4-py2.py3-none-any.whl has changed
Binary file virtualenv/fablib/virtualenv_support/pip-1.5.tar.gz has changed
Binary file virtualenv/fablib/virtualenv_support/setuptools-2.0.2-py2.py3-none-any.whl has changed
Binary file virtualenv/fablib/virtualenv_support/setuptools-2.0.2.tar.gz has changed
Binary file virtualenv/fablib/virtualenv_support/setuptools-2.2-py2.py3-none-any.whl has changed
--- a/virtualenv/res/lib/lib_create_env.py Thu Jan 09 14:20:48 2014 +0100
+++ b/virtualenv/res/lib/lib_create_env.py Wed Mar 26 15:32:32 2014 +0100
@@ -16,12 +16,12 @@
URLS = {
#'': {'setup': '', 'url':'', 'local':''},
- 'EDCSA': {'setup': 'edcsa', 'url':'https://pypi.python.org/packages/source/e/ecdsa/ecdsa-0.10.tar.gz', 'local':'ecdsa-0.10.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
+ 'EDCSA': {'setup': 'edcsa', 'url':'https://github.com/warner/python-ecdsa/archive/python-ecdsa-0.11.tar.gz', 'local':'ecdsa-0.10.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
'WSGIREF': {'setup': 'wsgiref', 'url':'https://pypi.python.org/packages/source/w/wsgiref/wsgiref-0.1.2.zip', 'local':'wsgiref-0.1.2.zip', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
'PYCRYPTO': {'setup': 'pycrypto', 'url':'http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/pycrypto-2.6.1.tar.gz', 'local':'pycrypto-2.6.1.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
- 'PARAMIKO' : {'setup': 'paramiko', 'url':'https://github.com/paramiko/paramiko/archive/v1.12.0.tar.gz', 'local':'paramiko-1.12.0.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
- 'FABRIC': {'setup': 'fabric', 'url':'https://pypi.python.org/packages/source/F/Fabric/Fabric-1.8.1.tar.gz', 'local':'Fabric-1.8.1.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
- 'MERCURIAL': {'setup': 'mercurial', 'url':'http://mercurial.selenic.com/release/mercurial-2.8.2.tar.gz', 'local':'mercurial-2.8.2.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
+ 'PARAMIKO' : {'setup': 'paramiko', 'url':'https://github.com/paramiko/paramiko/archive/v1.13.0.tar.gz', 'local':'paramiko-1.13.0.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
+ 'FABRIC': {'setup': 'fabric', 'url':'https://github.com/fabric/fabric/archive/1.8.3.tar.gz', 'local':'fabric-1.8.3.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
+ 'MERCURIAL': {'setup': 'mercurial', 'url':'http://mercurial.selenic.com/release/mercurial-2.9.1.tar.gz', 'local':'mercurial-2.9.1.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
}
class ResourcesEnv(object):
@@ -259,7 +259,6 @@
global logger
verbosity = options.verbose - options.quiet
- print(repr(Logger))
logger = Logger([(Logger.level_for_integer(2-verbosity), sys.stdout)])
Binary file virtualenv/res/src/Fabric-1.8.1.tar.gz has changed
Binary file virtualenv/res/src/ecdsa-0.10.tar.gz has changed
Binary file virtualenv/res/src/ecdsa-0.11.tar.gz has changed
Binary file virtualenv/res/src/fabric-1.8.3.tar.gz has changed
Binary file virtualenv/res/src/mercurial-2.8.2.tar.gz has changed
Binary file virtualenv/res/src/mercurial-2.9.1.tar.gz has changed
Binary file virtualenv/res/src/paramiko-1.12.0.tar.gz has changed
Binary file virtualenv/res/src/paramiko-1.13.0.tar.gz has changed