--- a/src/ldtplatform/urls.py Thu May 28 13:17:03 2015 +0200
+++ b/src/ldtplatform/urls.py Fri May 29 00:45:14 2015 +0200
@@ -9,7 +9,6 @@
from django.views.generic import RedirectView
-#from django.conf import settings
js_info_dict = {
'packages': ('django.contrib.admin',),
}
--- a/virtualenv/web/virtualenv.py Thu May 28 13:17:03 2015 +0200
+++ b/virtualenv/web/virtualenv.py Fri May 29 00:45:14 2015 +0200
@@ -2,7 +2,7 @@
"""Create a "virtual" Python installation
"""
-__version__ = "12.1.1"
+__version__ = "13.0.1"
virtualenv_version = __version__ # legacy
import base64
@@ -526,8 +526,7 @@
def file_search_dirs():
here = os.path.dirname(os.path.abspath(__file__))
- dirs = ['.', here,
- join(here, 'virtualenv_support')]
+ dirs = [here, join(here, 'virtualenv_support')]
if os.path.splitext(os.path.dirname(__file__))[0] != 'virtualenv':
# Probably some boot script; just in case virtualenv is installed...
try:
@@ -535,7 +534,8 @@
except ImportError:
pass
else:
- dirs.append(os.path.join(os.path.dirname(virtualenv.__file__), 'virtualenv_support'))
+ dirs.append(os.path.join(
+ os.path.dirname(virtualenv.__file__), 'virtualenv_support'))
return [d for d in dirs if os.path.isdir(d)]
@@ -722,6 +722,12 @@
action='store_true',
help='Do not install pip in the new virtualenv.')
+ parser.add_option(
+ '--no-wheel',
+ dest='no_wheel',
+ action='store_true',
+ help='Do not install wheel in the new virtualenv.')
+
default_search_dirs = file_search_dirs()
parser.add_option(
'--extra-search-dir',
@@ -822,6 +828,7 @@
never_download=True,
no_setuptools=options.no_setuptools,
no_pip=options.no_pip,
+ no_wheel=options.no_wheel,
symlink=options.symlink)
if 'after_install' in globals():
after_install(options, home_dir)
@@ -955,6 +962,7 @@
call_subprocess(cmd, show_stdout=False,
extra_env = {
'PYTHONPATH': pythonpath,
+ 'JYTHONPATH': pythonpath, # for Jython < 3.x
'PIP_FIND_LINKS': findlinks,
'PIP_USE_WHEEL': '1',
'PIP_PRE': '1',
@@ -968,7 +976,8 @@
def create_environment(home_dir, site_packages=False, clear=False,
unzip_setuptools=False,
prompt=None, search_dirs=None, never_download=False,
- no_setuptools=False, no_pip=False, symlink=True):
+ no_setuptools=False, no_pip=False, no_wheel=False,
+ symlink=True):
"""
Creates a new environment in ``home_dir``.
@@ -990,6 +999,8 @@
to_install = ['setuptools']
if not no_pip:
to_install.append('pip')
+ if not no_wheel:
+ to_install.append('wheel')
install_wheel(to_install, py_executable, search_dirs)
install_activate(home_dir, bin_dir, prompt)
Binary file virtualenv/web/virtualenv_support/argparse-1.3.0-py2.py3-none-any.whl has changed
Binary file virtualenv/web/virtualenv_support/pip-6.1.1-py2.py3-none-any.whl has changed
Binary file virtualenv/web/virtualenv_support/pip-7.0.1-py2.py3-none-any.whl has changed
Binary file virtualenv/web/virtualenv_support/setuptools-15.0-py2.py3-none-any.whl has changed
Binary file virtualenv/web/virtualenv_support/setuptools-16.0-py2.py3-none-any.whl has changed
Binary file virtualenv/web/virtualenv_support/wheel-0.24.0-py2.py3-none-any.whl has changed