remove tests and features relying on --no-site-packages

virtualenv dropped the --no-site-packages option. This PR updates the
code and tests to remove features related to that missing option.

* remove copy tests for --no-site-packages
* update test_mktmpenv_virtualenv_args to not need --no-site-packages
* update mkvirtualenv tests to not rely on --no-site-packages
* remove toggleglobalsitepackages command

related to #8

Author: dhellmann

docs/source/command_ref.rst

@@ -465,36 +465,6 @@ 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 setuptools.............................................
-    ..................................................................
-    ..................................................................
-    done.
-    (env1)$ toggleglobalsitepackages
-    Disabled global site-packages
-    (env1)$ toggleglobalsitepackages
-    Enabled global site-packages
-    (env1)$ toggleglobalsitepackages -q
-    (env1)$
-
 ============================
 Project Directory Management
 ============================

tests/test_cp.sh

@@ -137,33 +137,4 @@ GLOBAL postcpvirtualenv"
     rm -f "$WORKON_HOME/postmkvirtualenv"
 }
 
-test_no_site_packages () {
-    # See issue #102
-    mkvirtualenv "source" --no-site-packages >/dev/null 2>&1
-    cpvirtualenv "source" "destination" >/dev/null 2>&1 
-    ngsp_file="`virtualenvwrapper_get_site_packages_dir`/../no-global-site-packages.txt"
-    assertTrue "$ngsp_file does not exist in copied env" "[ -f \"$ngsp_file\" ]"
-}
-
-test_no_site_packages_default_args () {
-    # See issue #102
-    VIRTUALENVWRAPPER_VIRTUALENV_ARGS="--no-site-packages"
-    # With the argument, verify that they are not copied.
-    mkvirtualenv "source" >/dev/null 2>&1
-    cpvirtualenv "source" "destination" >/dev/null 2>&1 
-    ngsp_file="`virtualenvwrapper_get_site_packages_dir`/../no-global-site-packages.txt"
-    assertTrue "$ngsp_file does not exist" "[ -f \"$ngsp_file\" ]"
-    unset VIRTUALENVWRAPPER_VIRTUALENV_ARGS
-}
-
-test_no_site_packages_default_behavior () {
-    # See issue #102
-    # virtualenv 1.7 changed to make --no-site-packages the default
-    mkvirtualenv "source" >/dev/null 2>&1
-    cpvirtualenv "source" "destination" >/dev/null 2>&1 
-    ngsp_file="`virtualenvwrapper_get_site_packages_dir`/../no-global-site-packages.txt"
-    assertTrue "$ngsp_file does not exist in copied env" "[ -f \"$ngsp_file\" ]"
-}
-
 . "$test_dir/shunit2"
-

tests/test_lazy_loaded.sh

@@ -64,10 +64,6 @@ test_lssitepackages_defined_normal() {
     function_defined_normal lssitepackages
 }
 
-test_toggleglobalsitepackages_defined_normal() {
-    function_defined_normal toggleglobalsitepackages
-}
-
 test_cpvirtualenv_defined_normal() {
     function_defined_normal cpvirtualenv
 }

tests/test_mktmpenv.sh

@@ -43,9 +43,9 @@ test_mktmpenv_no_cd() {
 }
 
 test_mktmpenv_virtualenv_args() {
-    mktmpenv --no-site-packages >/dev/null 2>&1
-    ngsp_file="`virtualenvwrapper_get_site_packages_dir`/../no-global-site-packages.txt"
-    assertTrue "$ngsp_file does not exist" "[ -f \"$ngsp_file\" ]"
+    mktmpenv --without-pip >/dev/null 2>&1
+    contents="$(lssitepackages)"
+    assertFalse "found pip in site-packages: ${contents}" "echo $contents | grep -q pip"
 }
 
 test_deactivate() {

tests/test_mkvirtualenv.sh

@@ -104,23 +104,6 @@ test_no_workon_home () {
     WORKON_HOME="$old_home"
 }
 
-test_mkvirtualenv_sitepackages () {
-    # This part of the test is not reliable because
-    # creating a new virtualenv from inside the
-    # tox virtualenv inherits the setting from there.
-#     # Without the option, verify that site-packages are copied.
-# 	mkvirtualenv "with_sp" >/dev/null 2>&1
-#     ngsp_file="`virtualenvwrapper_get_site_packages_dir`/../no-global-site-packages.txt"
-#     assertFalse "$ngsp_file exists" "[ -f \"$ngsp_file\" ]"
-#     rmvirtualenv "env3"
-    
-    # With the argument, verify that they are not copied.
-    mkvirtualenv --no-site-packages "without_sp" >/dev/null 2>&1
-    ngsp_file="`virtualenvwrapper_get_site_packages_dir`/../no-global-site-packages.txt"
-    assertTrue "$ngsp_file does not exist" "[ -f \"$ngsp_file\" ]"
-    rmvirtualenv "env4" >/dev/null 2>&1
-}
-
 test_mkvirtualenv_hooks_system_site_packages () {
     # See issue #189
 
@@ -143,12 +126,14 @@ GLOBAL postmkvirtualenv"
 
 test_mkvirtualenv_args () {
     # See issue #102
-    VIRTUALENVWRAPPER_VIRTUALENV_ARGS="--no-site-packages"
+    VIRTUALENVWRAPPER_VIRTUALENV_ARGS="--without-pip"
     # With the argument, verify that they are not copied.
-    mkvirtualenv "without_sp2" >/dev/null 2>&1
-    ngsp_file="`virtualenvwrapper_get_site_packages_dir`/../no-global-site-packages.txt"
-    assertTrue "$ngsp_file does not exist" "[ -f \"$ngsp_file\" ]"
-    rmvirtualenv "env4" >/dev/null 2>&1
+    mkvirtualenv "without_pip" >/dev/null 2>&1
+    local RC=$?
+    assertTrue "mkvirtualenv failed" "[ $RC -eq 0 ]"
+    contents="$(lssitepackages)"
+    assertFalse "found pip in site-packages: ${contents}" "echo $contents | grep -q pip"
+    rmvirtualenv "without_pip" >/dev/null 2>&1
     unset VIRTUALENVWRAPPER_VIRTUALENV_ARGS
 }
 

tests/test_toggleglobalsitepackages.sh

@@ -948,22 +948,6 @@ function lssitepackages {
     fi
 }
 
-# Toggles the currently-active virtualenv between having and not having
-# access to the global site-packages.
-#:help:toggleglobalsitepackages: turn access to global site-packages on/off
-function toggleglobalsitepackages {
-    virtualenvwrapper_verify_workon_home || return 1
-    virtualenvwrapper_verify_active_environment || return 1
-    typeset no_global_site_packages_file="`virtualenvwrapper_get_site_packages_dir`/../no-global-site-packages.txt"
-    if [ -f $no_global_site_packages_file ]; then
-        rm $no_global_site_packages_file
-        [ "$1" = "-q" ] || echo "Enabled global site-packages"
-    else
-        touch $no_global_site_packages_file
-        [ "$1" = "-q" ] || echo "Disabled global site-packages"
-    fi
-}
-
 #:help:cpvirtualenv: duplicate the named virtualenv to make a new one
 function cpvirtualenv {
     virtualenvwrapper_verify_workon_home || return 1