Merge branch 'release/1.0.1'1.0.1

1 files changed, 3 insertions, 3 deletions

diff --git a/setup.py b/setup.py
index 1d6d703a4..3b072376b 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@ import os
 from setuptools import setup
 
 # If you change this version, change it also in docs/conf.py
-version = "1.0"
+version = "1.0.1"
 
 doc_dir = os.path.join(os.path.dirname(__file__), "docs")
 index_filename = os.path.join(doc_dir, "index.txt")
@@ -11,7 +11,7 @@ news_filename = os.path.join(doc_dir, "news.txt")
 long_description = """\
 The main website for pip is `www.pip-installer.org
 <http://www.pip-installer.org>`_.  You can also install
-the `in-development version <https://github.com/pypa/pip/tarball/master#egg=pip-dev>`_
+the `in-development version <https://github.com/pypa/pip/tarball/develop#egg=pip-dev>`_
 of pip with ``easy_install pip==dev``.
 """
 f = open(index_filename)
@@ -47,5 +47,5 @@ setup(name="pip",
       packages=['pip', 'pip.commands', 'pip.vcs'],
       entry_points=dict(console_scripts=['pip=pip:main', 'pip-%s=pip:main' % sys.version[:3]]),
       test_suite='nose.collector',
-      tests_require=['nose', 'virtualenv>=1.6', 'scripttest==1.1.1', 'mock'],
+      tests_require=['nose', 'virtualenv>=1.6', 'scripttest>=1.1.1', 'mock'],
       zip_safe=False)