merged from original

Author: t2y

.hgignore

@@ -1,4 +1,5 @@
 syntax: glob
+*~
 *.pyc
 README.html
 build
@@ -12,10 +13,14 @@ tests/catch_output
 tests/testpackage/build
 tests/testpackage/dist
 tests/testpackage/testpackage.egg-info
+tests/testtemplate/build
+tests/testtemplate/dist
+tests/testtemplate/testtemplate.egg-info
 trace.txt
 virtualenvwrapper.egg-info
 virtualenvwrapper/docs
 .tox
+*.orig
 
 syntax: re
 .DS_Store

.hgtags

@@ -68,3 +68,17 @@ b0f27c65fa64627599c2a022a076ae5ee7157ae4 2.6
 445a58d5a05a1426cefb47e54b692b6a58fdcc4f 2.6.1
 625d85d3136ff746accc490c5f9210b1b0074533 2.6.2
 e7582879df06689ec54cd820c377e89114b75ee2 2.6.3
+e7582879df06689ec54cd820c377e89114b75ee2 2.6.3
+246ce68795ea9caeb88ec2fa17e4f3151c58cf3f 2.6.3
+ea378ef00313cd77d251e61b4c0422503972b79f 2.7
+b20cf787d8e1c167853709ca01731a3efb4b5fe8 2.7.1
+7e0abe005937033aaf5d00fe3db3c94addecef7b 2.8
+7e0abe005937033aaf5d00fe3db3c94addecef7b 2.8
+279244c0fa41a327cc534fc40e9e7fadea180c23 2.8
+9e10c201a5005cc2d6c6728dfb0cda56deb4339d 2.10.1
+ff4d492c873c324ccfb71bc71118a67aa6195ad2 2.11
+12a1e0b65313944c3a28d9e71fdef1c7cd41b930 2.11.1
+434b87ebc24ae24e6928c72d79764379aae87130 3.0
+14cf7e58d32174c8e90cf6914a6604f3cff9f279 3.0.1
+ebbb3ba8168703861c016ed66f443fb898f0b06b 3.1
+dccf1a1abf4ea97589e9fa141167771049f031e0 3.2

ChangeLog

@@ -1,3 +1,22 @@
+2011-04-13  Doug Hellmann  <[email protected]>
+
+	* virtualenvwrapper.sh (rmvirtualenv): Move to a safe directory
+	before removing the virtual environment, and only move back if the
+	previously occupied directory still exists.
+
+2011-04-10  Doug Hellmann  <[email protected]>
+
+	* virtualenvwrapper.sh: Initialize VIRTUALENVWRAPPER_LOG_DIR and
+	VIRTUALENVWRAPPER_HOOK_DIR.
+
+	* virtualenvwrapper/hook_loader.py (main): Use
+	VIRTUALENVWRAPPER_LOG_DIR for logs instead of assuming
+	WORKON_HOME.
+
+	* virtualenvwrapper/user_scripts.py (make_hook): Change verbosity
+	of message telling the user we have created a new hook script for
+	them.
+
 2011-02-26  Doug Hellmann  <[email protected]>
 
 	* docs/sphinx/conf.py: Just hard-code the version.

MANIFEST.in

@@ -1,5 +1,11 @@
 include setup.py
 include distribute_setup.py
 include tests/*
+include tests/testpackage/setup.py
+include tests/testpackage/testscript.py
+include tests/testtemplate/distribute_setup.py
+include tests/testtemplate/setup.py
+include tests/testtemplate/mytemplates/*.py
 recursive-include docs *.rst *.py *.html *.css *.js *.png *.txt
+include tox.ini
 

README.txt

@@ -58,6 +58,13 @@ Python Versions
 
 virtualenvwrapper is tested under Python 2.4 - 2.7.
 
+Upgrading to 2.9
+================
+
+Version 2.9 includes the features previously delivered separately by
+``virtualenvwrapper.project``.  If you have an older verison of the
+project extensions installed, remove them before upgrading.
+
 Upgrading from 1.x
 ==================
 
@@ -99,6 +106,14 @@ issues.  Before reporting bugs in the bug tracker, please test
 *without* your aliases enabled.  If you can identify the alias causing
 the problem, that will help make virtualenvwrapper more robust.
 
+==========
+Change Log
+==========
+
+The `release history`_ is part of the project documentation.
+
+.. _release history: http://www.doughellmann.com/docs/virtualenvwrapper/history.html
+
 =======
 License
 =======

announce.rst

@@ -1,3 +1,9 @@
+=======================
+ virtualenvwrapper 3.2
+=======================
+
+.. tags:: virtualenvwrapper release python
+
 What is virtualenvwrapper
 =========================
 
@@ -7,15 +13,31 @@ virtual environments and otherwise managing your development workflow,
 making it easier to work on more than one project at a time without
 introducing conflicts in their dependencies.
 
-What's New in 2.2.1
+What's New in 3.2
 =================
 
-Version 2.2.1 is a bug-fix release:
+- Make ``project_dir`` a local variable so that
+  ``cdproject`` does not interfere with other variables
+  the user might have set. (contributed by ``slackorama``)
+- Fix typo in documentation reported by Nick Martin.
+- Change trove classifier for license "MIT" to reflect the license
+  text presented in the documentation. *This does not indicate a
+  change in the license, just a correction to the expression of that
+  intent.* (contributed by ``ralphbean`` as fix for issue 134)
+- Extend ``rmvirtualenv`` to allow removing more than one
+  environment at a time. (contributed by ``ciberglo``)
+- Change the definition of ``virtualenvwrapper_get_site_packages_dir``
+  to ask ``distutils`` for the ``site-packages`` directory instead of
+  trying to build the path ourselves in the shell script. This should
+  resolve issue 112 and improve support for Python interpreters other
+  than C Python. Thanks to Carl Meyer and Dario Bertini for their
+  contributions toward the fix.
+
+Installing
+==========
 
-- Escape ``which`` calls to avoid aliases. (#46)
-- Integrate Manuel Kaufmann's patch to unset GREP_OPTIONS before
-  calling grep. (#51)
-- Escape ``$`` in regex to resolve #53.
+Visit the virtualenvwrapper_ project page for download links and
+installation instructions.
 
 .. _virtualenv: http://pypi.python.org/pypi/virtualenv
 

docs/en/command_ref.rst

@@ -22,10 +22,11 @@ Create a new environment, in the WORKON_HOME.
 
 Syntax::
 
-    mkvirtualenv [options] ENVNAME
+    mkvirtualenv [-a project_path] [-i package] [-r requirements_file] [virtualenv options] ENVNAME
 
-All command line options are passed directly to ``virtualenv``.  The
-new environment is automatically activated after being initialized.
+All command line options except ``-a``, ``-i``, ``-r``, and ``-h`` are passed
+directly to ``virtualenv``.  The new environment is automatically
+activated after being initialized.
 
 ::
 
@@ -40,10 +41,49 @@ new environment is automatically activated after being initialized.
     mynewenv
     (mynewenv)$ 
 
+The ``-a`` option can be used to associate an existing project
+directory with the new environment.
+
+The ``-i`` option can be used to install one or more packages (by
+repeating the option) after the environment is created.
+
+The ``-r`` option can be used to specify a text file listing packages
+to be installed. The argument value is passed to ``pip -r`` to be
+installed.
+
 .. seealso::
 
    * :ref:`scripts-premkvirtualenv`
    * :ref:`scripts-postmkvirtualenv`
+   * `requirements file format`_
+
+.. _requirements file format: http://www.pip-installer.org/en/latest/requirement-format.html
+
+.. _command-mktmpenv:
+
+mktmpenv
+--------
+
+Create a new virtualenv in the ``WORKON_HOME`` directory.
+
+Syntax::
+
+    mktmpenv [VIRTUALENV_OPTIONS]
+
+A unique virtualenv name is generated.
+
+::
+
+    $ mktmpenv
+    Using real prefix '/Library/Frameworks/Python.framework/Versions/2.7'
+    New python executable in 1e513ac6-616e-4d56-9aa5-9d0a3b305e20/bin/python
+    Overwriting 1e513ac6-616e-4d56-9aa5-9d0a3b305e20/lib/python2.7/distutils/__init__.py 
+    with new content
+    Installing distribute...............................................
+    ....................................................................
+    .................................................................done.
+    This is a temporary environment. It will be deleted when deactivated.
+    (1e513ac6-616e-4d56-9aa5-9d0a3b305e20) $
 
 .. _command-lsvirtualenv:
 
@@ -82,6 +122,8 @@ Syntax::
 
    * :ref:`scripts-get_env_details`
 
+.. _command-rmvirtualenv:
+
 rmvirtualenv
 ------------
 
@@ -364,3 +406,129 @@ The directory names are added to a path file named
 for the environment.
 
 *Based on a contribution from James Bennett and Jannis Leidel.*
+
+.. _command-toggleglobalsitepackages:
+
+toggleglobalsitepackages
+------------------------
+
+Controls whether the active virtualenv will access the packages in the
+global Python ``site-packages`` directory.
+
+Syntax::
+
+    toggleglobalsitepackages [-q]
+
+Outputs the new state of the virtualenv. Use the ``-q`` switch to turn off all
+output.
+
+::
+
+    $ mkvirtualenv env1
+    New python executable in env1/bin/python
+    Installing distribute.............................................
+    ..................................................................
+    ..................................................................
+    done.
+    (env1)$ toggleglobalsitepackages
+    Disabled global site-packages
+    (env1)$ toggleglobalsitepackages
+    Enabled global site-packages
+    (env1)$ toggleglobalsitepackages -q
+    (env1)$
+
+============================
+Project Directory Management
+============================
+
+.. seealso::
+
+   :ref:`project-management`
+
+.. _command-mkproject:
+
+mkproject
+---------
+
+Create a new virtualenv in the WORKON_HOME and project directory in
+PROJECT_HOME.
+
+Syntax::
+
+    mkproject [-t template] [virtualenv_options] ENVNAME
+
+The template option may be repeated to have several templates used to
+create a new project.  The templates are applied in the order named on
+the command line.  All other options are passed to ``mkvirtualenv`` to
+create a virtual environment with the same name as the project.
+
+::
+
+    $ mkproject myproj
+    New python executable in myproj/bin/python
+    Installing distribute.............................................
+    ..................................................................
+    ..................................................................
+    done.
+    Creating /Users/dhellmann/Devel/myproj
+    (myproj)$ pwd
+    /Users/dhellmann/Devel/myproj
+    (myproj)$ echo $VIRTUAL_ENV
+    /Users/dhellmann/Envs/myproj
+    (myproj)$ 
+
+.. seealso::
+
+  * :ref:`scripts-premkproject`
+  * :ref:`scripts-postmkproject`
+
+setvirtualenvproject
+--------------------
+
+Bind an existing virtualenv to an existing project.
+
+Syntax::
+
+  setvirtualenvproject [virtualenv_path project_path]
+
+The arguments to ``setvirtualenvproject`` are the full paths to the
+virtualenv and project directory.  An association is made so that when
+``workon`` activates the virtualenv the project is also activated.
+
+::
+
+    $ mkproject myproj
+    New python executable in myproj/bin/python
+    Installing distribute.............................................
+    ..................................................................
+    ..................................................................
+    done.
+    Creating /Users/dhellmann/Devel/myproj
+    (myproj)$ mkvirtualenv myproj_new_libs
+    New python executable in myproj/bin/python
+    Installing distribute.............................................
+    ..................................................................
+    ..................................................................
+    done.
+    Creating /Users/dhellmann/Devel/myproj
+    (myproj_new_libs)$ setvirtualenvproject $VIRTUAL_ENV $(pwd)
+
+When no arguments are given, the current virtualenv and current
+directory are assumed.
+
+Any number of virtualenvs can refer to the same project directory,
+making it easy to switch between versions of Python or other
+dependencies for testing.
+
+.. _command-cdproject:
+
+cdproject
+---------
+
+Change the current working directory to the one specified as the
+project directory for the active virtualenv.
+
+Syntax::
+
+  cdproject
+