Skip to content

Commit

Permalink
Merge pull request #1149 from dstufft/upgrade
Browse files Browse the repository at this point in the history
Upgrade bundled dependencies
  • Loading branch information
dstufft authored Mar 17, 2018
2 parents e0c2484 + 7480ad8 commit 83d7a1a
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 3 deletions.
6 changes: 6 additions & 0 deletions docs/changes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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)
-------------------
Expand Down
12 changes: 9 additions & 3 deletions virtualenv.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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)
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit 83d7a1a

Please sign in to comment.