diff options
| author | Donald Stufft <donald@stufft.io> | 2014-05-16 22:38:39 -0400 |
|---|---|---|
| committer | Donald Stufft <donald@stufft.io> | 2014-05-16 22:38:39 -0400 |
| commit | 93cfa83481a1cb934eb14c946d33aef94c21bcb0 (patch) | |
| tree | 94ee052f684c6198c15e6cef4d2294ceeaf7e4ff | |
| parent | d432297b324acc06783b0caf229b8176127c31c7 (diff) | |
| parent | f0a8b6fdbb94fcbe5466fd26b48e60c6b54b1624 (diff) | |
| download | virtualenv-1.11.6.tar.gz | |
Merge branch '1.11.X'1.11.6
Conflicts:
docs/news.rst
| -rw-r--r-- | docs/news.rst | 6 | ||||
| -rwxr-xr-x | virtualenv.py | 2 | ||||
| -rw-r--r-- | virtualenv_support/pip-1.5.6-py2.py3-none-any.whl (renamed from virtualenv_support/pip-1.5.5-py2.py3-none-any.whl) | bin | 1173434 -> 1002021 bytes | |||
| -rw-r--r-- | virtualenv_support/setuptools-3.6-py2.py3-none-any.whl (renamed from virtualenv_support/setuptools-3.4.4-py2.py3-none-any.whl) | bin | 545729 -> 547415 bytes |
4 files changed, 7 insertions, 1 deletions
diff --git a/docs/news.rst b/docs/news.rst index ad3f174..a07a616 100644 --- a/docs/news.rst +++ b/docs/news.rst @@ -15,6 +15,12 @@ Changes & News with the upgraded Python. +1.11.6 (2014-05-16) +~~~~~~~~~~~~~~~~~~~ + +* Updated setuptools to 3.6 +* Updated pip to 1.5.6 + 1.11.5 (2014-05-03) ~~~~~~~~~~~~~~~~~~~ diff --git a/virtualenv.py b/virtualenv.py index 8150394..0329fc9 100755 --- a/virtualenv.py +++ b/virtualenv.py @@ -2,7 +2,7 @@ """Create a "virtual" Python installation """ -__version__ = "1.11.5" +__version__ = "1.11.6" virtualenv_version = __version__ # legacy import base64 diff --git a/virtualenv_support/pip-1.5.5-py2.py3-none-any.whl b/virtualenv_support/pip-1.5.6-py2.py3-none-any.whl Binary files differindex 7f96736..097ab43 100644 --- a/virtualenv_support/pip-1.5.5-py2.py3-none-any.whl +++ b/virtualenv_support/pip-1.5.6-py2.py3-none-any.whl diff --git a/virtualenv_support/setuptools-3.4.4-py2.py3-none-any.whl b/virtualenv_support/setuptools-3.6-py2.py3-none-any.whl Binary files differindex 7ca388a..f0ffcfc 100644 --- a/virtualenv_support/setuptools-3.4.4-py2.py3-none-any.whl +++ b/virtualenv_support/setuptools-3.6-py2.py3-none-any.whl |