Permalink
Browse files

Merge branch 'release/1.8.4' into develop

  • Loading branch information...
2 parents a74e97a + c511410 commit b1b9e5b371d5a9be662623fd0c68dc23576f531d @jezdez jezdez committed Nov 25, 2012
View
1 .travis.yml
@@ -4,6 +4,7 @@ python:
- "2.6"
- "2.7"
- "3.2"
+ - "3.3"
- "pypy"
install:
- pip install --use-mirrors nose coverage
View
1 bin/refresh-support-files.py
@@ -22,7 +22,6 @@
support_files = [
('http://pypi.python.org/packages/2.6/s/setuptools/setuptools-0.6c11-py2.6.egg', 'setuptools-0.6c11-py2.6.egg'),
('http://pypi.python.org/packages/2.5/s/setuptools/setuptools-0.6c11-py2.5.egg', 'setuptools-0.6c11-py2.5.egg'),
- ('http://pypi.python.org/packages/2.4/s/setuptools/setuptools-0.6c11-py2.4.egg', 'setuptools-0.6c11-py2.4.egg'),
('http://pypi.python.org/packages/source/d/distribute/distribute-0.6.31.tar.gz', 'distribute-0.6.31.tar.gz'),
('http://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz', 'pip-1.2.1.tar.gz'),
]
View
6 virtualenv.py
@@ -4,7 +4,7 @@
# If you change the version here, change it in setup.py
# and docs/conf.py as well.
-__version__ = "1.8.3" # following best practices
+__version__ = "1.8.4" # following best practices
virtualenv_version = __version__ # legacy, again
import base64
@@ -1876,8 +1876,8 @@ def after_install(options, home_dir):
This example immediately installs a package, and runs a setup
script from that package.
- If you provide something like ``python_version='2.4'`` then the
- script will start with ``#!/usr/bin/env python2.4`` instead of
+ If you provide something like ``python_version='2.5'`` then the
+ script will start with ``#!/usr/bin/env python2.5`` instead of
``#!/usr/bin/env python``. You can use this when the script must
be run with a particular Python version.
"""
View
BIN virtualenv_support/setuptools-0.6c11-py2.4.egg
Binary file not shown.

0 comments on commit b1b9e5b

Please sign in to comment.