Automated merge with ssh://hg@bitbucket.org/ianb/virtualenv

--HG-- branch : trunk
cheshire · Nov 10, 2009 · 926ab44 · 926ab44
2 parents 2c21a5f + 989e2be
commit 926ab44
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 6 deletions.
diff --git a/bin/refresh-support-files.py b/bin/refresh-support-files.py
@@ -17,7 +17,7 @@
     ('http://pypi.python.org/packages/2.4/s/setuptools/setuptools-0.6c11-py2.4.egg', 'setuptools-0.6c11-py2.4.egg'),
     ('http://python-distribute.org/distribute_setup.py', 'distribute_setup.py'),
     ('http://pypi.python.org/packages/source/d/distribute/distribute-0.6.8.tar.gz', 'distribute-0.6.8.tar.gz'),
-    ('http://pypi.python.org/packages/source/p/pip/pip-0.5.1.tar.gz', 'pip-0.5.1.tar.gz'),
+    ('http://pypi.python.org/packages/source/p/pip/pip-0.6.tar.gz', 'pip-0.6.tar.gz'),
     ]
 
 def main():

diff --git a/docs/conf.py b/docs/conf.py
@@ -42,7 +42,7 @@
 # The short X.Y version.
 version = '1.4'
 # The full version, including alpha/beta/rc tags.
-release = '1.4.post1'
+release = '1.4.1'
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:

diff --git a/docs/index.txt b/docs/index.txt
@@ -317,8 +317,9 @@ Other Documentation and Links
 Changes & News
 --------------
 
-hg tip
+1.4.1
-~~~~~~
+~~~~~
+* Include pip 0.6
 
 1.4
 ~~~

diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
     print 'Note: without Setuptools installed you will have to use "python -m virtualenv ENV"'
 import sys, os
 
-version = '1.4.post1'
+version = '1.4.1'
 
 f = open(os.path.join(os.path.dirname(__file__), 'docs', 'index.txt'))
 long_description = f.read().strip()

diff --git a/virtualenv.py b/virtualenv.py
@@ -407,7 +407,7 @@ def filter_ez_setup(line, project_name='setuptools'):
 
 def main():
     parser = optparse.OptionParser(
-        version="1.4.post1",
+        version="1.4.1",
         usage="%prog [OPTIONS] DEST_DIR")
 
     parser.add_option(

diff --git a/virtualenv_support/pip-0.5.1.tar.gz b/virtualenv_support/pip-0.5.1.tar.gz
diff --git a/virtualenv_support/pip-0.6.tar.gz b/virtualenv_support/pip-0.6.tar.gz