Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'hotfix/1.6.4'

  • Loading branch information...
commit b8a7db81c5a7db7a970240b0c13001203d831311 2 parents 12f7b05 + a9ef1c5
@jezdez jezdez authored
View
2  docs/conf.py
@@ -42,7 +42,7 @@
#
# The short X.Y version.
-release = "1.6.3"
+release = "1.6.4"
version = ".".join(release.split(".")[:2])
# There are two options for replacing |today|: either, you set today to some
View
5 docs/news.txt
@@ -6,6 +6,11 @@ Next release (1.7) schedule
Beta release mid-July 2011, final release early August.
+1.6.4 (2011-07-21)
+~~~~~~~~~~~~~~~~~~
+
+* Restored ability to run on Python 2.4, too.
+
1.6.3 (2011-07-16)
~~~~~~~~~~~~~~~~~~
View
2  setup.py
@@ -26,7 +26,7 @@
setup(name='virtualenv',
# If you change the version here, change it in virtualenv.py and
# docs/conf.py as well
- version="1.6.3",
+ version="1.6.4",
description="Virtual Python Environment builder",
long_description=long_description,
classifiers=[
View
2  tests/test_virtualenv.py
@@ -4,7 +4,7 @@
def test_version():
"""Should have a version string"""
- assert virtualenv.virtualenv_version == "1.6.3", "Should have version"
+ assert virtualenv.virtualenv_version == "1.6.4", "Should have version"
@patch('os.path.exists')
View
23 virtualenv.py
@@ -4,7 +4,7 @@
# If you change the version here, change it in setup.py
# and docs/conf.py as well.
-virtualenv_version = "1.6.3"
+virtualenv_version = "1.6.4"
import base64
import sys
@@ -487,16 +487,17 @@ def _install_req(py_executable, unzip=False, distribute=False,
sys.path = sys.path[1:]
try:
- # check if the global Python has distribute installed or plain
- # setuptools
- import pkg_resources
- if not hasattr(pkg_resources, '_distribute'):
- location = os.path.dirname(pkg_resources.__file__)
- logger.notify("A globally installed setuptools was found (in %s)" % location)
- logger.notify("Use the --no-site-packages option to use distribute in "
- "the virtualenv.")
- except ImportError:
- pass
+ try:
+ # check if the global Python has distribute installed or plain
+ # setuptools
+ import pkg_resources
+ if not hasattr(pkg_resources, '_distribute'):
+ location = os.path.dirname(pkg_resources.__file__)
+ logger.notify("A globally installed setuptools was found (in %s)" % location)
+ logger.notify("Use the --no-site-packages option to use distribute in "
+ "the virtualenv.")
+ except ImportError:
+ pass
finally:
sys.path = _prev_sys_path
Please sign in to comment.
Something went wrong with that request. Please try again.