Skip to content

Commit 83d7a1a

Browse files
authored
Merge pull request #1149 from dstufft/upgrade
Upgrade bundled dependencies
2 parents e0c2484 + 7480ad8 commit 83d7a1a

File tree

6 files changed

+15
-3
lines changed

6 files changed

+15
-3
lines changed

docs/changes.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ Release History
44
15.2.0 (unreleased)
55
-------------------
66

7+
* Upgrade setuptools to 38.6.0.
8+
9+
* Upgrade pip to 9.0.2.
10+
11+
* Upgrade wheel to 0.30.0.
12+
713

814
15.1.0 (2016-11-15)
915
-------------------

virtualenv.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -931,13 +931,19 @@ def create_environment(home_dir, site_packages=False, clear=False,
931931
to_install = []
932932

933933
if not no_setuptools:
934-
to_install.append('setuptools')
934+
if sys.version_info[:2] == (2, 6):
935+
to_install.append('setuptools<37')
936+
else:
937+
to_install.append('setuptools')
935938

936939
if not no_pip:
937940
to_install.append('pip')
938941

939942
if not no_wheel:
940-
to_install.append('wheel')
943+
if sys.version_info[:2] == (2, 6):
944+
to_install.append("wheel<0.30")
945+
else:
946+
to_install.append('wheel')
941947

942948
if to_install:
943949
install_wheel(
@@ -1289,7 +1295,7 @@ def install_python(home_dir, lib_dir, inc_dir, bin_dir, site_packages, clear, sy
12891295
copyfile(py_executable, python_executable, symlink)
12901296

12911297
if is_win:
1292-
for name in ['libexpat.dll',
1298+
for name in ['libexpat.dll',
12931299
'libeay32.dll', 'ssleay32.dll', 'sqlite3.dll',
12941300
'tcl85.dll', 'tk85.dll']:
12951301
src = join(prefix, name)
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)