Permalink
Browse files

Merge branch 'release/1.7.2'

  • Loading branch information...
2 parents 1a3a9c0 + 5bc16df commit c80ab42b6d3a345d71c39c8bdab197015ad3ed4b @jezdez jezdez committed Jun 22, 2012
View
@@ -5,4 +5,6 @@ docs/_build
.DS_Store
*.pyc
mock-*.egg
-nose-*.egg
+nose-*.egg
+.tox
+tests/test_activate_actual.output
View
@@ -0,0 +1,14 @@
+language: python
+python:
+ - "2.5"
+ - "2.6"
+ - "2.7"
+ - "3.2"
+ - "pypy"
+script:
+ - python setup.py test
+notifications:
+ irc:
+ channels: "irc.freenode.org#pip"
+ on_success: change
+ on_failure: change
View
@@ -17,13 +17,15 @@ Alex Grönholm
Anatoly Techtonik
Antonio Cuni
Armin Ronacher
+Bradley Ayers
Cap Petschulat
CBWhiz
Chris McDonough
Christian Stefanescu
Christopher Nilsson
Cliff Xuan
Curt Micol
+David Schoonover
Doug Hellmann
Doug Napoleone
Douglas Creager
@@ -35,9 +37,14 @@ Jeff Hammel
Jonathan Griffin
Jorge Vargas
Josh Bronson
+Konstantin Zemlyak
Kumar McMillan
Lars Francke
+Marc Abramowitz
+Mike Hommey
+Miki Tebeka
Philip Jenvey
+Raul Leal
Ronny Pfannschmidt
Stefano Rivera
Tarek Ziadé
View
@@ -1,9 +1,11 @@
-recursive-include docs *.txt
+recursive-include bin *
+recursive-include docs *
recursive-include scripts *
recursive-include virtualenv_support *.egg *.tar.gz
recursive-include virtualenv_embedded *
-recursive-exclude docs/_templates *.*
+recursive-exclude docs/_templates *
+recursive-exclude docs/_build *
include virtualenv_support/__init__.py
include *.py
include AUTHORS.txt
-include LICENSE.txt
+include LICENSE.txt
View
@@ -0,0 +1,7 @@
+virtualenv
+==========
+
+.. image:: https://secure.travis-ci.org/pypa/virtualenv.png?branch=develop
+ :target: http://travis-ci.org/pypa/virtualenv
+
+For documentation, see http://www.virtualenv.org/
@@ -23,7 +23,7 @@
('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.24.tar.gz', 'distribute-0.6.24.tar.gz'),
+ ('http://pypi.python.org/packages/source/d/distribute/distribute-0.6.27.tar.gz', 'distribute-0.6.27.tar.gz'),
('http://pypi.python.org/packages/source/p/pip/pip-1.1.tar.gz', 'pip-1.1.tar.gz'),
]
View
@@ -39,11 +39,14 @@
# The default replacements for |version| and |release|, also used in various
# other places throughout the built documents.
-#
-# The short X.Y version.
-
-release = "1.7.1.2"
-version = ".".join(release.split(".")[:2])
+try:
+ from virtualenv import __version__
+ # The short X.Y version.
+ version = '.'.join(__version__.split('.')[:2])
+ # The full version, including alpha/beta/rc tags.
+ release = __version__
+except ImportError:
+ version = release = 'dev'
# There are two options for replacing |today|: either, you set today to some
# non-false value, then it is used:
@@ -83,7 +86,7 @@
# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+# html_static_path = ['_static']
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
# using the given strftime format.
View
@@ -17,8 +17,8 @@ Installation
------------
You can install virtualenv with ``pip install virtualenv``, or the `latest
-development version <https://github.com/pypa/virtualenv/tarball/develop#egg=virtualenv-dev>`_
-with ``pip install virtualenv==dev``.
+development version <https://github.com/pypa/virtualenv/tarball/develop>`_
+with ``pip install https://github.com/pypa/virtualenv/tarball/develop``.
You can also use ``easy_install``, or if you have no Python package manager
available at all, you can just grab the single file `virtualenv.py`_ and run
@@ -71,9 +71,9 @@ Distribute instead of setuptools, just call virtualenv like this::
$ python virtualenv.py --distribute ENV
-You can also set the environment variable VIRTUALENV_USE_DISTRIBUTE.
+You can also set the environment variable VIRTUALENV_DISTRIBUTE.
-A new virtualenv also includes the `pip <http://pypy.python.org/pypi/pip>`_
+A new virtualenv also includes the `pip <http://pypi.python.org/pypi/pip>`_
installer, so you can use ``ENV/bin/pip`` to install additional packages into
the environment.
@@ -93,7 +93,7 @@ virtualenv can not only be configured by passing command line options such as
For example, to automatically install Distribute instead of setuptools
you can also set an environment variable::
- $ export VIRTUALENV_USE_DISTRIBUTE=true
+ $ export VIRTUALENV_DISTRIBUTE=true
$ python virtualenv.py ENV
It's the same as passing the option to virtualenv directly::
@@ -114,7 +114,7 @@ virtualenv can not only be configured by passing command line options such as
virtualenv also looks for a standard ini config file. On Unix and Mac OS X
that's ``$HOME/.virtualenv/virtualenv.ini`` and on Windows, it's
- ``%HOME%\\virtualenv\\virtualenv.ini``.
+ ``%APPDATA%\virtualenv\virtualenv.ini``.
The names of the settings are derived from the long command line option,
e.g. the option ``--distribute`` would look like this::
@@ -276,7 +276,7 @@ below.
policy to ``AllSigned``, meaning all scripts on the system must be
digitally signed to be executed. Since the virtualenv activation
script is signed by one of the authors (Jannis Leidel) this level of
- the execution policy suffices. As an adminstrator run::
+ the execution policy suffices. As an administrator run::
PS C:\> Set-ExecutionPolicy AllSigned
@@ -479,13 +479,15 @@ Contributing
------------
Refer to the `contributing to pip`_ documentation - it applies equally to
-virtualenv.
+virtualenv, except that virtualenv issues should filed on the `virtualenv
+repo`_ at GitHub.
Virtualenv's release schedule is tied to pip's -- each time there's a new pip
release, there will be a new virtualenv release that bundles the new version of
pip.
.. _contributing to pip: http://www.pip-installer.org/en/latest/contributing.html
+.. _virtualenv repo: https://github.com/pypa/virtualenv/
Running the tests
~~~~~~~~~~~~~~~~~
@@ -537,7 +539,7 @@ Other Documentation and Links
<http://code.google.com/p/modwsgi/wiki/VirtualEnvironments>`_.
* `virtualenv commands
- <http://thisismedium.com/tech/extending-virtualenv/>`_ for some more
+ <https://github.com/thisismedium/virtualenv-commands>`_ for some more
workflow-related tools around virtualenv.
Status and License
View
@@ -1,6 +1,49 @@
Changes & News
--------------
+.. warning::
+
+ Python bugfix releases 2.6.8, 2.7.3, 3.1.5 and 3.2.3 include a change that
+ will cause "import random" to fail with "cannot import name urandom" on any
+ virtualenv created on a Unix host with an earlier release of Python
+ 2.6/2.7/3.1/3.2, if the underlying system Python is upgraded. This is due to
+ the fact that a virtualenv uses the system Python's standard library but
+ contains its own copy of the Python interpreter, so an upgrade to the system
+ Python results in a mismatch between the version of the Python interpreter
+ and the version of the standard library. It can be fixed by removing
+ ``$ENV/bin/python`` and re-running virtualenv on the same target directory
+ with the upgraded Python.
+
+
+1.7.2 (2012-06-22)
+~~~~~~~~~~~~~~~~~~
+
+* Updated to distribute 0.6.27.
+
+* Fix activate.fish on OS X. Fixes #8. Thanks David Schoonover.
+
+* Create a virtualenv-x.x script with the Python version when installing, so
+ virtualenv for multiple Python versions can be installed to the same
+ script location. Thanks Miki Tebeka.
+
+* Restored ability to create a virtualenv with a path longer than 78
+ characters, without breaking creation of virtualenvs with non-ASCII paths.
+ Thanks, Bradley Ayers.
+
+* Added ability to create virtualenvs without having installed Apple's
+ developers tools (using an own implementation of ``install_name_tool``).
+ Thanks Mike Hommey.
+
+* Fixed PyPy and Jython support on Windows. Thanks Konstantin Zemlyak.
+
+* Added pydoc script to ease use. Thanks Marc Abramowitz. Fixes #149.
+
+* Fixed creating a bootstrap script on Python 3. Thanks Raul Leal. Fixes #280.
+
+* Fixed inconsistency when having set the ``PYTHONDONTWRITEBYTECODE`` env var
+ with the --distribute option or the ``VIRTUALENV_USE_DISTRIBUTE`` env var.
+ ``VIRTUALENV_USE_DISTRIBUTE`` is now considered again as a legacy alias.
+
1.7.1.2 (2012-02-17)
~~~~~~~~~~~~~~~~~~~~
@@ -210,7 +253,7 @@ Changes & News
* Fix problem with ``virtualenv --relocate`` when ``bin/`` has
subdirectories (e.g., ``bin/.svn/``); from Alan Franzoni.
-* If you set ``$VIRTUALENV_USE_DISTRIBUTE`` then virtualenv will use
+* If you set ``$VIRTUALENV_DISTRIBUTE`` then virtualenv will use
Distribute by default (so you don't have to remember to use
``--distribute``).
View
@@ -1,16 +1,31 @@
-import sys, os
+import os
+import re
+import shutil
+import sys
+
try:
from setuptools import setup
- kw = {'entry_points':
- """[console_scripts]\nvirtualenv = virtualenv:main\n""",
- 'zip_safe': False}
+ setup_params = {
+ 'entry_points': {
+ 'console_scripts': [
+ 'virtualenv=virtualenv:main',
+ 'virtualenv-%s.%s=virtualenv:main' % sys.version_info[:2]
+ ],
+ },
+ 'zip_safe': False,
+ 'test_suite': 'nose.collector',
+ 'tests_require': ['nose', 'Mock'],
+ }
except ImportError:
from distutils.core import setup
if sys.platform == 'win32':
print('Note: without Setuptools installed you will have to use "python -m virtualenv ENV"')
- kw = {}
+ setup_params = {}
else:
- kw = {'scripts': ['scripts/virtualenv']}
+ script = 'scripts/virtualenv'
+ script_ver = script + '-%s.%s' % sys.version_info[:2]
+ shutil.copy(script, script_ver)
+ setup_params = {'scripts': [script, script_ver]}
here = os.path.dirname(os.path.abspath(__file__))
@@ -23,13 +38,35 @@
long_description += "\n\n" + f.read()
f.close()
-setup(name='virtualenv',
- # If you change the version here, change it in virtualenv.py and
- # docs/conf.py as well
- version="1.7.1.2",
- description="Virtual Python Environment builder",
- long_description=long_description,
- classifiers=[
+
+def get_version():
+ f = open(os.path.join(here, 'virtualenv.py'))
+ version_file = f.read()
+ f.close()
+ version_match = re.search(r"^__version__ = ['\"]([^'\"]*)['\"]",
+ version_file, re.M)
+ if version_match:
+ return version_match.group(1)
+ raise RuntimeError("Unable to find version string.")
+
+
+# Hack to prevent stupid TypeError: 'NoneType' object is not callable error on
+# exit of python setup.py test # in multiprocessing/util.py _exit_function when
+# running python setup.py test (see
+# http://www.eby-sarna.com/pipermail/peak/2010-May/003357.html)
+try:
+ import multiprocessing
+except ImportError:
+ pass
+
+setup(
+ name='virtualenv',
+ # If you change the version here, change it in virtualenv.py and
+ # docs/conf.py as well
+ version=get_version(),
+ description="Virtual Python Environment builder",
+ long_description=long_description,
+ classifiers=[
'Development Status :: 4 - Beta',
'Intended Audience :: Developers',
'License :: OSI Approved :: MIT License',
@@ -41,18 +78,15 @@
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.1',
'Programming Language :: Python :: 3.2',
- ],
- keywords='setuptools deployment installation distutils',
- author='Ian Bicking',
- author_email='ianb@colorstudy.com',
- maintainer='Jannis Leidel, Carl Meyer and Brian Rosner',
- maintainer_email='python-virtualenv@groups.google.com',
- url='http://www.virtualenv.org',
- license='MIT',
- py_modules=['virtualenv'],
- packages=['virtualenv_support'],
- package_data={'virtualenv_support': ['*-py%s.egg' % sys.version[:3], '*.tar.gz']},
- test_suite='nose.collector',
- tests_require=['nose', 'Mock'],
- **kw
- )
+ ],
+ keywords='setuptools deployment installation distutils',
+ author='Ian Bicking',
+ author_email='ianb@colorstudy.com',
+ maintainer='Jannis Leidel, Carl Meyer and Brian Rosner',
+ maintainer_email='python-virtualenv@groups.google.com',
+ url='http://www.virtualenv.org',
+ license='MIT',
+ py_modules=['virtualenv'],
+ packages=['virtualenv_support'],
+ package_data={'virtualenv_support': ['*-py%s.egg' % sys.version[:3], '*.tar.gz']},
+ **setup_params)
Oops, something went wrong.

0 comments on commit c80ab42

Please sign in to comment.