diff options
| -rw-r--r-- | docs/conf.py | 2 | ||||
| -rw-r--r-- | docs/news.txt | 5 | ||||
| -rw-r--r-- | setup.py | 2 | ||||
| -rw-r--r-- | tests/test_virtualenv.py | 2 | ||||
| -rw-r--r-- | virtualenv.py | 23 |
5 files changed, 20 insertions, 14 deletions
diff --git a/docs/conf.py b/docs/conf.py index 733bc99..5d00e89 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -42,7 +42,7 @@ copyright = '2007-2011, Ian Bicking, The Open Planning Project, The virtualenv d # # 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 diff --git a/docs/news.txt b/docs/news.txt index bc2832b..4e20e0f 100644 --- a/docs/news.txt +++ b/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) ~~~~~~~~~~~~~~~~~~ @@ -26,7 +26,7 @@ f.close() 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=[ diff --git a/tests/test_virtualenv.py b/tests/test_virtualenv.py index da327f8..4eedbac 100644 --- a/tests/test_virtualenv.py +++ b/tests/test_virtualenv.py @@ -4,7 +4,7 @@ from mock import patch, Mock 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') diff --git a/virtualenv.py b/virtualenv.py index 331c5c5..c173dd4 100644 --- a/virtualenv.py +++ b/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 |