Skip to content

Commit d664afc

Browse files
committed
Merge branch 'hotfix/1.6.3' into develop
2 parents 09e1d40 + e0cf4e7 commit d664afc

File tree

5 files changed

+18
-10
lines changed

5 files changed

+18
-10
lines changed

docs/conf.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
#
4343
# The short X.Y version.
4444

45-
release = "1.6.2"
45+
release = "1.6.3"
4646
version = ".".join(release.split(".")[:2])
4747

4848
# There are two options for replacing |today|: either, you set today to some

docs/news.txt

+5
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ Next release (1.7) schedule
66

77
Beta release mid-July 2011, final release early August.
88

9+
1.6.3 (2011-07-16)
10+
~~~~~~~~~~~~~~~~~~
11+
12+
* Restored ability to run on Python < 2.7.
13+
914
1.6.2 (2011-07-16)
1015
~~~~~~~~~~~~~~~~~~
1116

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
setup(name='virtualenv',
2727
# If you change the version here, change it in virtualenv.py and
2828
# docs/conf.py as well
29-
version="1.6.2",
29+
version="1.6.3",
3030
description="Virtual Python Environment builder",
3131
long_description=long_description,
3232
classifiers=[

tests/test_virtualenv.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
def test_version():
66
"""Should have a version string"""
7-
assert virtualenv.virtualenv_version == "1.6.2", "Should have version"
7+
assert virtualenv.virtualenv_version == "1.6.3", "Should have version"
88

99

1010
@patch('os.path.exists')

virtualenv.py

+10-7
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
# If you change the version here, change it in setup.py
66
# and docs/conf.py as well.
7-
virtualenv_version = "1.6.2"
7+
virtualenv_version = "1.6.3"
88

99
import base64
1010
import sys
@@ -13,7 +13,6 @@
1313
import re
1414
import shutil
1515
import logging
16-
import sysconfig
1716
import tempfile
1817
import zlib
1918
import errno
@@ -1273,11 +1272,15 @@ def fix_local_scheme(home_dir):
12731272
Platforms that use the "posix_local" install scheme (like Ubuntu with
12741273
Python 2.7) need to be given an additional "local" location, sigh.
12751274
"""
1276-
if sysconfig._get_default_scheme() == 'posix_local':
1277-
local_path = os.path.join(home_dir, 'local')
1278-
if not os.path.exists(local_path):
1279-
os.symlink(os.path.abspath(home_dir), local_path)
1280-
1275+
try:
1276+
import sysconfig
1277+
except ImportError:
1278+
pass
1279+
else:
1280+
if sysconfig._get_default_scheme() == 'posix_local':
1281+
local_path = os.path.join(home_dir, 'local')
1282+
if not os.path.exists(local_path):
1283+
os.symlink(os.path.abspath(home_dir), local_path)
12811284

12821285
def fix_lib64(lib_dir):
12831286
"""

0 commit comments

Comments
 (0)