diff options
| author | Donald Stufft <donald@stufft.io> | 2018-03-17 11:21:27 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-17 11:21:27 -0400 |
| commit | 83d7a1a08db570da768338689fb412aea6be92c1 (patch) | |
| tree | eeab48244f6a10d014e1da4d4e620e92727a1832 | |
| parent | e0c24841be5e088c333d338a6aa0ee20c15912ec (diff) | |
| parent | 7480ad8e1ccd76eed827ec5e0258146a0cd8ce08 (diff) | |
| download | virtualenv-83d7a1a08db570da768338689fb412aea6be92c1.tar.gz | |
Merge pull request #1149 from dstufft/upgrade
Upgrade bundled dependencies
| -rw-r--r-- | docs/changes.rst | 6 | ||||
| -rwxr-xr-x | virtualenv.py | 12 | ||||
| -rw-r--r-- | virtualenv_support/pip-9.0.2-py2.py3-none-any.whl (renamed from virtualenv_support/pip-9.0.1-py2.py3-none-any.whl) | bin | 1254803 -> 1400942 bytes | |||
| -rw-r--r-- | virtualenv_support/setuptools-36.8.0-py2.py3-none-any.whl (renamed from virtualenv_support/setuptools-28.8.0-py2.py3-none-any.whl) | bin | 472830 -> 482722 bytes | |||
| -rw-r--r-- | virtualenv_support/setuptools-38.6.0-py2.py3-none-any.whl | bin | 0 -> 490301 bytes | |||
| -rw-r--r-- | virtualenv_support/wheel-0.30.0-py2.py3-none-any.whl | bin | 0 -> 49751 bytes |
6 files changed, 15 insertions, 3 deletions
diff --git a/docs/changes.rst b/docs/changes.rst index 1a591f9..a4fca23 100644 --- a/docs/changes.rst +++ b/docs/changes.rst @@ -4,6 +4,12 @@ Release History 15.2.0 (unreleased) ------------------- +* Upgrade setuptools to 38.6.0. + +* Upgrade pip to 9.0.2. + +* Upgrade wheel to 0.30.0. + 15.1.0 (2016-11-15) ------------------- diff --git a/virtualenv.py b/virtualenv.py index deec814..b46900c 100755 --- a/virtualenv.py +++ b/virtualenv.py @@ -931,13 +931,19 @@ def create_environment(home_dir, site_packages=False, clear=False, to_install = [] if not no_setuptools: - to_install.append('setuptools') + if sys.version_info[:2] == (2, 6): + to_install.append('setuptools<37') + else: + to_install.append('setuptools') if not no_pip: to_install.append('pip') if not no_wheel: - to_install.append('wheel') + if sys.version_info[:2] == (2, 6): + to_install.append("wheel<0.30") + else: + to_install.append('wheel') if to_install: install_wheel( @@ -1289,7 +1295,7 @@ def install_python(home_dir, lib_dir, inc_dir, bin_dir, site_packages, clear, sy copyfile(py_executable, python_executable, symlink) if is_win: - for name in ['libexpat.dll', + for name in ['libexpat.dll', 'libeay32.dll', 'ssleay32.dll', 'sqlite3.dll', 'tcl85.dll', 'tk85.dll']: src = join(prefix, name) diff --git a/virtualenv_support/pip-9.0.1-py2.py3-none-any.whl b/virtualenv_support/pip-9.0.2-py2.py3-none-any.whl Binary files differindex 4b8ecc6..baf1f57 100644 --- a/virtualenv_support/pip-9.0.1-py2.py3-none-any.whl +++ b/virtualenv_support/pip-9.0.2-py2.py3-none-any.whl diff --git a/virtualenv_support/setuptools-28.8.0-py2.py3-none-any.whl b/virtualenv_support/setuptools-36.8.0-py2.py3-none-any.whl Binary files differindex 502e3cb..c32c1f7 100644 --- a/virtualenv_support/setuptools-28.8.0-py2.py3-none-any.whl +++ b/virtualenv_support/setuptools-36.8.0-py2.py3-none-any.whl diff --git a/virtualenv_support/setuptools-38.6.0-py2.py3-none-any.whl b/virtualenv_support/setuptools-38.6.0-py2.py3-none-any.whl Binary files differnew file mode 100644 index 0000000..af7622c --- /dev/null +++ b/virtualenv_support/setuptools-38.6.0-py2.py3-none-any.whl diff --git a/virtualenv_support/wheel-0.30.0-py2.py3-none-any.whl b/virtualenv_support/wheel-0.30.0-py2.py3-none-any.whl Binary files differnew file mode 100644 index 0000000..b7fbaa4 --- /dev/null +++ b/virtualenv_support/wheel-0.30.0-py2.py3-none-any.whl |