Commit 5cb83303 authored by Jan Dittberner's avatar Jan Dittberner

New upstream version 4.8.2

parent 8cfac560
......@@ -3,18 +3,24 @@ Aron Griffis <aron@arongriffis.com>
Axel H. <noirbizarre@gmail.com>
Bernardo B. Marques <bernardo.fire@gmail.com>
Carl Karsten <carl@personnelware.com>
Chris L <chris@chrisdeveloper.com>
ChrisHas35 <none@none>
Christopher Arndt <chris@chrisarndt.de>
Clay McClure <clay@daemons.net>
Daniel Hahler <git@thequod.de>
Daniel Kraus <daniel@tr0ll.net>
David Szotten <davidszotten@gmail.com>
David Wolever <david@wolever.net>
Devin Sevilla <dasevilla@gmail.com>
Doug Harris <dharris@gmail.com>
Doug Harris <dharris@truthinitiative.org>
Doug Hellmann <doug.hellmann@gmail.com>
Doug Hellmann <doug@doughellmann.com>
Erick M'bwana <erick@regulusweb.com>
Erik B <erik.bernoth@gmail.com>
Greg Haskins <greg@greghaskins.com>
Harry <hjwp2@cantab.net>
Hiro Ashiya <kekelo1603@gmail.com>
Ismail Badawi <isbadawi@gmail.com>
Ismail Sunni <imajimatika@gmail.com>
James Bennett <james@b-list.org>
......@@ -22,6 +28,7 @@ Jason Myers <jason@jasonamyers.com>
Jason Myers <jason@mailthemyers.com>
Jason Veatch <jtveatch@yahoo.com>
Jeff Byrnes <jeff@evertrue.com>
Jeff Widman <jeff@jeffwidman.com>
Jessamyn Smith <geekchick77@gmail.com>
John Brewer <brewerja@gmail.com>
Justin Abrahms <justin@abrah.ms>
......@@ -45,20 +52,26 @@ Radu Voicilas <radu.voicilas@gmail.com>
Ralph Bean <rbean@redhat.com>
Raphael Das Gupta <bitbucket.org@raphael.dasgupta.ch>
Robson Peixoto <robsonpeixoto@gmail.com>
Sam Brightman <sam.brightman@gmail.com>
Sander Smits <jhmsmits@gmail.com>
Scott Stevenson <scott@scottstvnsn.com>
Shrikant-Sharat <shrikantsharat.k@gmail.com>
SpotlightKid <bitbucket@chrisarndt.de>
Stephen McQuay <stephen@mcquay.me>
Steve Steiner <ssteinerX@gmail.com>
Thomas Desvenain <thomas.desvenain@ingeniweb.com>
Tobias <Tobias@debian-server.fritz.box>
William McVey <wam@cisco.com>
Xidorn Quan <quanxunzhen@gmail.com>
Zhiming Wang <zmwangx@gmail.com>
bwanamarko <bwanamarko@yahoo.com>
convert-repo <none@none>
dbr <dbr.onix@gmail.com>
humitos <none@none>
jforcier <none@none>
kk6 <hiro.ashiya@gmail.com>
lendenmc <chris@chrisdeveloper.com>
lonetwin <steve@lonetwin.net>
matt@sprout.staffknex.com <matt@sprout.staffknex.com>
noirbizarre <none@none>
seth@seth-ec-laptop <seth@seth-ec-laptop>
......
This diff is collapsed.
Metadata-Version: 1.1
Name: virtualenvwrapper
Version: 4.7.2
Version: 4.8.2
Summary: Enhancements to virtualenv
Home-page: http://virtualenvwrapper.readthedocs.org/
Home-page: https://virtualenvwrapper.readthedocs.io/
Author: Doug Hellmann
Author-email: doug@doughellmann.com
License: MIT
Description-Content-Type: UNKNOWN
Description: .. -*- mode: rst -*-
#################
......@@ -71,7 +72,7 @@ Description: .. -*- mode: rst -*-
Python Versions
===============
virtualenvwrapper is tested under Python 2.6 - 3.4.
virtualenvwrapper is tested under Python 2.6 - 3.6.
=======
Support
......@@ -137,8 +138,6 @@ Classifier: Programming Language :: Python :: 3
Classifier: Programming Language :: Python :: 3.3
Classifier: Programming Language :: Python :: 3.4
Classifier: Programming Language :: Python :: 3.5
Classifier: Programming Language :: Python :: 3.6
Classifier: Intended Audience :: Developers
Classifier: Environment :: Console
Provides: virtualenvwrapper
Provides: virtualenvwrapper.user_scripts
Provides: virtualenvwrapper.project
......@@ -63,7 +63,7 @@ from this page.
Python Versions
===============
virtualenvwrapper is tested under Python 2.6 - 3.4.
virtualenvwrapper is tested under Python 2.6 - 3.6.
=======
Support
......
......@@ -169,7 +169,7 @@ created elsewhere.
Copying virtual environments is not well supported. Each virtualenv
has path information hard-coded into it, and there may be cases
where the copy code does not know to update a particular
where the copy code does not know it needs to update a particular
file. **Use with caution.**
Syntax::
......
......@@ -58,7 +58,7 @@ How the Shell Runs a Program
When a shell receives a command to be executed, either interactively
or by parsing a script file, and determines that the command is
implemented in a separate program file, is uses ``fork()`` to create a
implemented in a separate program file, it uses ``fork()`` to create a
new process and then inside that process it uses one of the ``exec``
functions to start the specified program. The language that program is
written in doesn't make any difference in the decision about whether
......
......@@ -39,7 +39,7 @@ First, some initialization steps. Most of this only needs to be done
one time. You will want to add the command to ``source
/usr/local/bin/virtualenvwrapper.sh`` to your shell startup file,
changing the path to virtualenvwrapper.sh depending on where it was
installed by pip.
installed by pip or your package manager.
::
......@@ -197,10 +197,6 @@ of Python Magazine: `virtualenvwrapper | And Now For Something
Completely Different
<https://doughellmann.com/blog/2008/05/01/virtualenvwrapper/>`_.
Rich Leland has created a short `screencast
<http://mathematism.com/2009/07/30/presentation-pip-and-virtualenv/>`__
showing off the features of virtualenvwrapper.
Manuel Kaufmann has `translated this documentation into Spanish
<https://virtualenvwrapper-docs-es.readthedocs.org/es/latest/>`__.
......
......@@ -76,7 +76,7 @@ can download virtualenvwrapper-powershell_ from PyPI.
Python Versions
===============
virtualenvwrapper is tested under Python 2.6-3.4.
virtualenvwrapper is tested under Python 2.7-3.6.
.. _install-basic:
......
......@@ -135,12 +135,9 @@ it a proper path then it will do the right thing.
And to finally restore the default behaviour of ``cd`` once you
bailout of a VENV via a ``deactivate`` command, you need to add this
as a ``postdeactivate`` hook (`source
<https://github.com/kdeldycke/dotfiles/commit/80470b>`_)::
as a ``postdeactivate`` hook::
cd () {
builtin cd "$@"
}
unset -f cd
Clean up environments on exit
=======================================
......
......@@ -16,16 +16,13 @@ classifier =
Programming Language :: Python :: 3.3
Programming Language :: Python :: 3.4
Programming Language :: Python :: 3.5
Programming Language :: Python :: 3.6
Intended Audience :: Developers
Environment :: Console
keywords =
virtualenv
home-page = http://virtualenvwrapper.readthedocs.org/
home-page = https://virtualenvwrapper.readthedocs.io/
zip_safe = False
provides_dist =
virtualenvwrapper
virtualenvwrapper.user_scripts
virtualenvwrapper.project
[files]
packages =
......@@ -89,5 +86,4 @@ all_files = 1
[egg_info]
tag_build =
tag_date = 0
tag_svn_revision = 0
[tox]
envlist = py27,py26,py33,py34,py35,zsh,ksh,style
envlist = py27,py26,py33,py34,py35,py36,zsh,ksh,style
[testenv]
install_command = pip install -U {opts} {packages}
......@@ -49,4 +49,4 @@ basepython=python2.7
deps =
-r{toxinidir}/requirements.txt
-r{toxinidir}/docs/requirements.txt
commands = python setup.py build_sphinx
\ No newline at end of file
commands = python setup.py build_sphinx
Metadata-Version: 1.1
Name: virtualenvwrapper
Version: 4.7.2
Summary: Enhancements to virtualenv
Home-page: http://virtualenvwrapper.readthedocs.org/
Author: Doug Hellmann
Author-email: doug@doughellmann.com
License: MIT
Description: .. -*- mode: rst -*-
#################
virtualenvwrapper
#################
virtualenvwrapper is a set of extensions to Ian Bicking's `virtualenv
<http://pypi.python.org/pypi/virtualenv>`_ tool. The extensions include
wrappers for creating and deleting 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.
**Warning:** The 4.x release includes some potentially incompatible
changes for extensions from 3.x. The python modules for extensions are
now *always* run with ``PWD=$WORKON_HOME`` (previously the value of
PWD varied depending on the hook). The *shell* portion of any hook
(anything sourced by the user's shell when the hook is run) is still
run in the same place as before.
========
Features
========
1. Organizes all of your virtual environments in one place.
2. Wrappers for creating, copying and deleting environments, including
user-configurable hooks.
3. Use a single command to switch between environments.
4. Tab completion for commands that take a virtual environment as
argument.
5. User-configurable hooks for all operations.
6. Plugin system for more creating sharable extensions.
Rich Leland has created a short `screencast
<http://mathematism.com/2009/07/30/presentation-pip-and-virtualenv/>`__
showing off the features of virtualenvwrapper.
============
Installation
============
See the `project documentation
<http://www.doughellmann.com/docs/virtualenvwrapper/>`__ for
installation and setup instructions.
Supported Shells
================
virtualenvwrapper is a set of shell *functions* defined in Bourne
shell compatible syntax. It is tested under ``bash``, ``ksh``, and ``zsh``.
It may work with other shells, so if you find that it does work with a
shell not listed here please let me know. If you can modify it to
work with another shell, without completely rewriting it, send a pull
request through the bitbucket project page. If you write a clone to
work with an incompatible shell, let me know and I will link to it
from this page.
Python Versions
===============
virtualenvwrapper is tested under Python 2.6 - 3.4.
=======
Support
=======
Join the `virtualenvwrapper Google Group
<http://groups.google.com/group/virtualenvwrapper/>`__ to discuss
issues and features.
Report bugs via the `bug tracker on Bitbucket
<https://bitbucket.org/virtualenvwrapper/virtualenvwrapper/issues>`__.
Shell Aliases
=============
Since virtualenvwrapper is largely a shell script, it uses shell
commands for a lot of its actions. If your environment makes heavy
use of shell aliases or other customizations, you may encounter
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
=======
Copyright Doug Hellmann, All Rights Reserved
Permission to use, copy, modify, and distribute this software and its
documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
both that copyright notice and this permission notice appear in
supporting documentation, and that the name of Doug Hellmann not be used
in advertising or publicity pertaining to distribution of the software
without specific, written prior permission.
DOUG HELLMANN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
EVENT SHALL DOUG HELLMANN BE LIABLE FOR ANY SPECIAL, INDIRECT OR
CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.
Keywords: virtualenv
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: License :: OSI Approved :: MIT License
Classifier: Programming Language :: Python
Classifier: Programming Language :: Python :: 2
Classifier: Programming Language :: Python :: 2.6
Classifier: Programming Language :: Python :: 2.7
Classifier: Programming Language :: Python :: 3
Classifier: Programming Language :: Python :: 3.3
Classifier: Programming Language :: Python :: 3.4
Classifier: Programming Language :: Python :: 3.5
Classifier: Intended Audience :: Developers
Classifier: Environment :: Console
Provides: virtualenvwrapper
Provides: virtualenvwrapper.user_scripts
Provides: virtualenvwrapper.project
AUTHORS
ChangeLog
LICENSE
MANIFEST.in
Makefile
README.es.rst
README.ja.rst
README.txt
requirements.txt
setup.cfg
setup.py
tox.ini
virtualenvwrapper.sh
virtualenvwrapper_lazy.sh
docs/Makefile
docs/requirements.txt
docs/spelling_wordlist.txt
docs/source/command_ref.rst
docs/source/conf.py
docs/source/design.rst
docs/source/developers.rst
docs/source/extensions.rst
docs/source/glossary.rst
docs/source/history.rst
docs/source/hooks.rst
docs/source/index.rst
docs/source/install.rst
docs/source/plugins.rst
docs/source/projects.rst
docs/source/scripts.rst
docs/source/tips.rst
tests/manual_test_install.sh
tests/run_tests
tests/setup.sh
tests/shunit2
tests/test.sh
tests/test_add2virtualenv.sh
tests/test_allvirtualenv.sh
tests/test_cd.sh
tests/test_cd_alias.sh
tests/test_cd_space_in_name.sh
tests/test_cp.sh
tests/test_cpvirtualenv.sh
tests/test_deactivate.sh
tests/test_derive_workon_home.sh
tests/test_dir_stack.sh
tests/test_expandpath.sh
tests/test_hook_dir.sh
tests/test_lazy.sh
tests/test_lazy_extending.sh
tests/test_lazy_loaded.sh
tests/test_lazy_run.sh
tests/test_log_file.sh
tests/test_ls.sh
tests/test_mktmpenv.sh
tests/test_mkvirtualenv.sh
tests/test_mkvirtualenv_associate.sh
tests/test_mkvirtualenv_install.sh
tests/test_mkvirtualenv_requirements.sh
tests/test_project.sh
tests/test_project_activate.sh
tests/test_project_cd.sh
tests/test_project_mk.sh
tests/test_project_templates.sh
tests/test_rmvirtualenv.sh
tests/test_run_hook.sh
tests/test_setvirtualenvproject.sh
tests/test_support.sh
tests/test_tempfile.sh
tests/test_toggleglobalsitepackages.sh
tests/test_virtualenvwrapper.sh
tests/test_wipeenv.sh
tests/test_workon.sh
tests/testpackage/setup.py
tests/testpackage/testscript.py
tests/testtemplate/setup.py
tests/testtemplate/mytemplates/__init__.py
tests/testtemplate/mytemplates/main.py
virtualenvwrapper/__init__.py
virtualenvwrapper/hook_loader.py
virtualenvwrapper/project.py
virtualenvwrapper/user_scripts.py
virtualenvwrapper.egg-info/PKG-INFO
virtualenvwrapper.egg-info/SOURCES.txt
virtualenvwrapper.egg-info/dependency_links.txt
virtualenvwrapper.egg-info/entry_points.txt
virtualenvwrapper.egg-info/namespace_packages.txt
virtualenvwrapper.egg-info/pbr.json
virtualenvwrapper.egg-info/requires.txt
virtualenvwrapper.egg-info/top_level.txt
virtualenvwrapper.egg-info/zip-safe
\ No newline at end of file
[virtualenvwrapper.get_env_details]
user_scripts = virtualenvwrapper.user_scripts:get_env_details
[virtualenvwrapper.initialize]
project = virtualenvwrapper.project:initialize
user_scripts = virtualenvwrapper.user_scripts:initialize
[virtualenvwrapper.initialize_source]
user_scripts = virtualenvwrapper.user_scripts:initialize_source
[virtualenvwrapper.post_activate_source]
project = virtualenvwrapper.project:post_activate_source
user_scripts = virtualenvwrapper.user_scripts:post_activate_source
[virtualenvwrapper.post_cpvirtualenv_source]
user_scripts = virtualenvwrapper.user_scripts:post_cpvirtualenv_source
[virtualenvwrapper.post_deactivate_source]
user_scripts = virtualenvwrapper.user_scripts:post_deactivate_source
[virtualenvwrapper.post_mkvirtualenv_source]
user_scripts = virtualenvwrapper.user_scripts:post_mkvirtualenv_source
[virtualenvwrapper.post_rmvirtualenv]
user_scripts = virtualenvwrapper.user_scripts:post_rmvirtualenv
[virtualenvwrapper.pre_activate]
user_scripts = virtualenvwrapper.user_scripts:pre_activate
[virtualenvwrapper.pre_cpvirtualenv]
user_scripts = virtualenvwrapper.user_scripts:pre_cpvirtualenv
[virtualenvwrapper.pre_deactivate_source]
user_scripts = virtualenvwrapper.user_scripts:pre_deactivate_source
[virtualenvwrapper.pre_mkvirtualenv]
user_scripts = virtualenvwrapper.user_scripts:pre_mkvirtualenv
[virtualenvwrapper.pre_rmvirtualenv]
user_scripts = virtualenvwrapper.user_scripts:pre_rmvirtualenv
[virtualenvwrapper.project.post_mkproject_source]
project = virtualenvwrapper.project:post_mkproject_source
[virtualenvwrapper.project.pre_mkproject]
project = virtualenvwrapper.project:pre_mkproject
{"is_release": false, "git_version": "0b90c35"}
\ No newline at end of file
virtualenv
virtualenv-clone
stevedore
......@@ -45,26 +45,26 @@
#
# Locate the global Python where virtualenvwrapper is installed.
if [ "$VIRTUALENVWRAPPER_PYTHON" = "" ]
if [ "${VIRTUALENVWRAPPER_PYTHON:-}" = "" ]
then
VIRTUALENVWRAPPER_PYTHON="$(command \which python)"
fi
# Set the name of the virtualenv app to use.
if [ "$VIRTUALENVWRAPPER_VIRTUALENV" = "" ]
if [ "${VIRTUALENVWRAPPER_VIRTUALENV:-}" = "" ]
then
VIRTUALENVWRAPPER_VIRTUALENV="virtualenv"
fi
# Set the name of the virtualenv-clone app to use.
if [ "$VIRTUALENVWRAPPER_VIRTUALENV_CLONE" = "" ]
if [ "${VIRTUALENVWRAPPER_VIRTUALENV_CLONE:-}" = "" ]
then
VIRTUALENVWRAPPER_VIRTUALENV_CLONE="virtualenv-clone"
fi
# Define script folder depending on the platorm (Win32/Unix)
VIRTUALENVWRAPPER_ENV_BIN_DIR="bin"
if [ "$OS" = "Windows_NT" ] && ([ "$MSYSTEM" = "MINGW32" ] || [ "$MSYSTEM" = "MINGW64" ])
if [ "${OS:-}" = "Windows_NT" ] && ([ "${MSYSTEM:-}" = "MINGW32" ] || [ "${MSYSTEM:-}" = "MINGW64" ])
then
# Only assign this for msys, cygwin use standard Unix paths
# and its own python installation
......@@ -73,7 +73,7 @@ fi
# Let the user override the name of the file that holds the project
# directory name.
if [ "$VIRTUALENVWRAPPER_PROJECT_FILENAME" = "" ]
if [ "${VIRTUALENVWRAPPER_PROJECT_FILENAME:-}" = "" ]
then
export VIRTUALENVWRAPPER_PROJECT_FILENAME=".project"
fi
......@@ -83,7 +83,7 @@ fi
export VIRTUALENVWRAPPER_WORKON_CD=${VIRTUALENVWRAPPER_WORKON_CD:-1}
# Remember where we are running from.
if [ -z "$VIRTUALENVWRAPPER_SCRIPT" ]
if [ -z "${VIRTUALENVWRAPPER_SCRIPT:-}" ]
then
if [ -n "$BASH" ]
then
......@@ -108,10 +108,10 @@ fi
# we are trying to change the state of the current shell, so we use
# "builtin" for bash and zsh but "command" under ksh.
function virtualenvwrapper_cd {
if [ -n "$BASH" ]
if [ -n "${BASH:-}" ]
then
builtin \cd "$@"
elif [ -n "$ZSH_VERSION" ]
elif [ -n "${ZSH_VERSION:-}" ]
then
builtin \cd -q "$@"
else
......@@ -228,7 +228,7 @@ function virtualenvwrapper_run_hook {
( \
virtualenvwrapper_cd "$WORKON_HOME" &&
"$VIRTUALENVWRAPPER_PYTHON" -m 'virtualenvwrapper.hook_loader' \
$HOOK_VERBOSE_OPTION --script "$hook_script" "$@" \
${HOOK_VERBOSE_OPTION:-} --script "$hook_script" "$@" \
)
result=$?
......@@ -244,8 +244,8 @@ function virtualenvwrapper_run_hook {
source "$hook_script"
elif [ "${1}" = "initialize" ]
then
cat - 1>&2 <<EOF
virtualenvwrapper.sh: There was a problem running the initialization hooks.
cat - 1>&2 <<EOF
virtualenvwrapper.sh: There was a problem running the initialization hooks.
If Python could not import the module virtualenvwrapper.hook_loader,
check that virtualenvwrapper has been installed for
......@@ -260,7 +260,7 @@ EOF
# Set up tab completion. (Adapted from Arthur Koziel's version at
# http://arthurkoziel.com/2008/10/11/virtualenvwrapper-bash-completion/)
function virtualenvwrapper_setup_tab_completion {
if [ -n "$BASH" ] ; then
if [ -n "${BASH:-}" ] ; then
_virtualenvs () {
local cur="${COMP_WORDS[COMP_CWORD]}"
COMPREPLY=( $(compgen -W "`virtualenvwrapper_show_workon_options`" -- ${cur}) )
......@@ -304,8 +304,9 @@ function virtualenvwrapper_initialize {
# Set the location of the hook scripts
if [ "$VIRTUALENVWRAPPER_HOOK_DIR" = "" ]
then
export VIRTUALENVWRAPPER_HOOK_DIR="$WORKON_HOME"
VIRTUALENVWRAPPER_HOOK_DIR="$WORKON_HOME"
fi
export VIRTUALENVWRAPPER_HOOK_DIR
mkdir -p "$VIRTUALENVWRAPPER_HOOK_DIR"
......@@ -515,7 +516,7 @@ function rmvirtualenv {
virtualenvwrapper_verify_workon_home || return 1
if [ ${#@} = 0 ]
then
echo "Please specify an enviroment." >&2
echo "Please specify an environment." >&2
return 1
fi
......@@ -557,7 +558,7 @@ function rmvirtualenv {
# List the available environments.
function virtualenvwrapper_show_workon_options {
virtualenvwrapper_verify_workon_home || return 1
# NOTE: DO NOT use ls or cd here because colorized versions spew control
# NOTE: DO NOT use ls or cd here because colorized versions spew control
# characters into the output list.
# echo seems a little faster than find, even with -depth 3.
# Note that this is a little tricky, as there may be spaces in the path.
......@@ -572,7 +573,7 @@ function virtualenvwrapper_show_workon_options {
# a slash, as that is an illegal character in a directory name.
# This yields a slash-separated list of possible env names.
# 4. Replace each slash with a newline to show the output one name per line.
# 5. Eliminate any lines with * on them because that means there
# 5. Eliminate any lines with * on them because that means there
# were no envs.
(virtualenvwrapper_cd "$WORKON_HOME" && echo */$VIRTUALENVWRAPPER_ENV_BIN_DIR/activate) 2>/dev/null \
| command \tr "\n" " " \
......@@ -593,7 +594,7 @@ function _lsvirtualenv_usage {
function lsvirtualenv {
typeset long_mode=true
if command -v "getopts" &> /dev/null
if command -v "getopts" >/dev/null 2>&1
then
# Use getopts when possible
OPTIND=1
......@@ -749,12 +750,17 @@ function workon {
# Deactivate any current environment "destructively"
# before switching so we use our override function,
# if it exists.
# if it exists, but make sure it's the deactivate function
# we set up
type deactivate >/dev/null 2>&1
if [ $? -eq 0 ]
then
deactivate
unset -f deactivate >/dev/null 2>&1
type deactivate | grep 'typeset env_postdeactivate_hook' >/dev/null 2>&1
if [ $? -eq 0 ]
then
deactivate
unset -f deactivate >/dev/null 2>&1
fi
fi
virtualenvwrapper_run_hook "pre_activate" "$env_name"
......@@ -809,7 +815,7 @@ function virtualenvwrapper_get_python_version {
# Prints the path to the site-packages directory for the current environment.
function virtualenvwrapper_get_site_packages_dir {
"$VIRTUAL_ENV/$VIRTUALENVWRAPPER_ENV_BIN_DIR/python" -c "import distutils; print(distutils.sysconfig.get_python_lib())"
"$VIRTUAL_ENV/$VIRTUALENVWRAPPER_ENV_BIN_DIR/python" -c "import distutils.sysconfig; print(distutils.sysconfig.get_python_lib())"
}
# Path management for packages outside of the virtual env.
......@@ -947,7 +953,7 @@ function cpvirtualenv {
typeset src_name="$1"
typeset trg_name="$2"
typeset src
typeset trg
typeset trg
# without a source there is nothing to do
if [ "$src_name" = "" ]; then
......@@ -991,10 +997,10 @@ function cpvirtualenv {
echo "Copying $src_name as $trg_name..."
(
[ -n "$ZSH_VERSION" ] && setopt SH_WORD_SPLIT
[ -n "$ZSH_VERSION" ] && setopt SH_WORD_SPLIT
virtualenvwrapper_cd "$WORKON_HOME" &&
"$VIRTUALENVWRAPPER_VIRTUALENV_CLONE" "$src" "$trg"
[ -d "$trg" ] &&
"$VIRTUALENVWRAPPER_VIRTUALENV_CLONE" "$src" "$trg"
[ -d "$trg" ] &&
virtualenvwrapper_run_hook "pre_cpvirtualenv" "$src" "$trg_name" &&
virtualenvwrapper_run_hook "pre_mkvirtualenv" "$trg_name"
)
......@@ -1281,7 +1287,7 @@ function wipeenv {
virtualenvwrapper_verify_active_environment || return 1
typeset req_file="$(virtualenvwrapper_tempfile "requirements.txt")"
pip freeze | egrep -v '(distribute|wsgiref)' > "$req_file"
pip freeze | egrep -v '(distribute|wsgiref|appdirs|packaging|pyparsing|six)' > "$req_file"
if [ -n "$(cat "$req_file")" ]
then
echo "Uninstalling packages:"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment