Skip to content
This repository
Browse code

Merge branch 'release/1.8.4' into develop

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

0 notes on commit b1b9e5b

Please sign in to comment.
Something went wrong with that request. Please try again.