Updating to support virtualenv 20+

Signed-off-by: Jason Myers <[email protected]>

Author: jasonamyers

Makefile

@@ -40,7 +40,7 @@ test:
 	tox
 
 test-quick:
-	tox -e py27
+	tox -e py37
 
 develop:
 	python setup.py develop

docs/source/developers.rst

@@ -50,7 +50,7 @@ documentation::
     writing output... [100%] index
 
     writing additional files... search
-    copying static files... WARNING: static directory '/Users/dhellmann/Devel/virtualenvwrapper/plugins/docs/sphinx/pkg/static' does not exist
+    copying static files... WARNING: static directory '/Users/username/Devel/virtualenvwrapper/plugins/docs/sphinx/pkg/static' does not exist
     done
     dumping search index... done
     dumping object inventory... done

docs/source/index.rst

@@ -54,10 +54,10 @@ installed by pip or your package manager.
   ....................................................
   ....................................................
   ...............................done.
-  virtualenvwrapper.user_scripts Creating /Users/dhellmann/Envs/env1/bin/predeactivate
-  virtualenvwrapper.user_scripts Creating /Users/dhellmann/Envs/env1/bin/postdeactivate
-  virtualenvwrapper.user_scripts Creating /Users/dhellmann/Envs/env1/bin/preactivate
-  virtualenvwrapper.user_scripts Creating /Users/dhellmann/Envs/env1/bin/postactivate  New python executable in env1/bin/python
+  virtualenvwrapper.user_scripts Creating /Users/username/Envs/env1/bin/predeactivate
+  virtualenvwrapper.user_scripts Creating /Users/username/Envs/env1/bin/postdeactivate
+  virtualenvwrapper.user_scripts Creating /Users/username/Envs/env1/bin/preactivate
+  virtualenvwrapper.user_scripts Creating /Users/username/Envs/env1/bin/postactivate  New python executable in env1/bin/python
   (env1)$ ls $WORKON_HOME
   env1 hook.log
 
@@ -72,7 +72,7 @@ Now we can install some software into the environment.
   Installing collected packages: django
     Running setup.py install for django
       changing mode of build/scripts-2.6/django-admin.py from 644 to 755
-      changing mode of /Users/dhellmann/Envs/env1/bin/django-admin.py to 755
+      changing mode of /Users/username/Envs/env1/bin/django-admin.py to 755
   Successfully installed django
 
 We can see the new package with ``lssitepackages``::
@@ -91,18 +91,18 @@ Of course we are not limited to a single virtualenv::
   ....................................................
   ....................................................
   ........... ...............................done.
-  virtualenvwrapper.user_scripts Creating /Users/dhellmann/Envs/env2/bin/predeactivate
-  virtualenvwrapper.user_scripts Creating /Users/dhellmann/Envs/env2/bin/postdeactivate
-  virtualenvwrapper.user_scripts Creating /Users/dhellmann/Envs/env2/bin/preactivate
-  virtualenvwrapper.user_scripts Creating /Users/dhellmann/Envs/env2/bin/postactivate  New python executable in env2/bin/python
+  virtualenvwrapper.user_scripts Creating /Users/username/Envs/env2/bin/predeactivate
+  virtualenvwrapper.user_scripts Creating /Users/username/Envs/env2/bin/postdeactivate
+  virtualenvwrapper.user_scripts Creating /Users/username/Envs/env2/bin/preactivate
+  virtualenvwrapper.user_scripts Creating /Users/username/Envs/env2/bin/postactivate  New python executable in env2/bin/python
   (env2)$ ls $WORKON_HOME
   env1            env2            hook.log
 
 Switch between environments with ``workon``::
 
   (env2)$ workon env1
   (env1)$ echo $VIRTUAL_ENV
-  /Users/dhellmann/Envs/env1
+  /Users/username/Envs/env1
   (env1)$
 
 The ``workon`` command also includes tab completion for the
@@ -114,7 +114,7 @@ is activated or deactivated (see :ref:`scripts`).
   (env1)$ echo 'cd $VIRTUAL_ENV' >> $WORKON_HOME/postactivate
   (env1)$ workon env2
   (env2)$ pwd
-  /Users/dhellmann/Envs/env2
+  /Users/username/Envs/env2
 
 :ref:`scripts-postmkvirtualenv` is run when a new environment is
 created, letting you automatically install commonly-used tools.
@@ -128,10 +128,10 @@ created, letting you automatically install commonly-used tools.
   ....................................................
   ....................................................
   ........... ...............................done.
-  virtualenvwrapper.user_scripts Creating /Users/dhellmann/Envs/env3/bin/predeactivate
-  virtualenvwrapper.user_scripts Creating /Users/dhellmann/Envs/env3/bin/postdeactivate
-  virtualenvwrapper.user_scripts Creating /Users/dhellmann/Envs/env3/bin/preactivate
-  virtualenvwrapper.user_scripts Creating /Users/dhellmann/Envs/env3/bin/postactivate
+  virtualenvwrapper.user_scripts Creating /Users/username/Envs/env3/bin/predeactivate
+  virtualenvwrapper.user_scripts Creating /Users/username/Envs/env3/bin/postdeactivate
+  virtualenvwrapper.user_scripts Creating /Users/username/Envs/env3/bin/preactivate
+  virtualenvwrapper.user_scripts Creating /Users/username/Envs/env3/bin/postactivate
   Downloading/unpacking sphinx
     Downloading Sphinx-0.6.5.tar.gz (972Kb): 972Kb downloaded
     Running setup.py egg_info for package sphinx
@@ -152,12 +152,12 @@ created, letting you automatically install commonly-used tools.
     Running setup.py install for Pygments
     Running setup.py install for sphinx
       no previously-included directories found matching 'doc/_build'
-      Installing sphinx-build script to /Users/dhellmann/Envs/env3/bin
-      Installing sphinx-quickstart script to /Users/dhellmann/Envs/env3/bin
-      Installing sphinx-autogen script to /Users/dhellmann/Envs/env3/bin
+      Installing sphinx-build script to /Users/username/Envs/env3/bin
+      Installing sphinx-quickstart script to /Users/username/Envs/env3/bin
+      Installing sphinx-autogen script to /Users/username/Envs/env3/bin
   Successfully installed docutils Jinja2 Pygments sphinx  (env3)$
   (venv3)$ which sphinx-build
-  /Users/dhellmann/Envs/env3/bin/sphinx-build
+  /Users/username/Envs/env3/bin/sphinx-build
 
 Through a combination of the existing functions defined by the core
 package (see :ref:`command`), third-party plugins (see

requirements.txt

@@ -1,3 +1,3 @@
-virtualenv
+virtualenv>=20.0.4
 virtualenv-clone
 stevedore

setup.cfg

@@ -10,13 +10,13 @@ classifier =
     License :: OSI Approved :: MIT License
     Programming Language :: Python
     Programming Language :: Python :: 2
-    Programming Language :: Python :: 2.6
     Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.3
     Programming Language :: Python :: 3.4
     Programming Language :: Python :: 3.5
     Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
+    Programming Language :: Python :: 3.8
     Intended Audience :: Developers
     Environment :: Console
 keywords =

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py33,py34,py35,py36,zsh,ksh,style
+envlist = py27,py34,py35,py36,py37,py38,zsh,ksh,style
 
 [testenv]
 install_command = pip install -U {opts} {packages}

virtualenvwrapper.sh

@@ -82,7 +82,7 @@ then
 fi
 
 # Define script folder depending on the platorm (Win32/Unix)
-VIRTUALENVWRAPPER_ENV_BIN_DIR="bin"
+VIRTUALENVWRAPPER_ENV_BIN_DIR="usr/local/bin"
 if [ "${OS:-}" = "Windows_NT" ] && ([ "${MSYSTEM:-}" = "MINGW32" ] || [ "${MSYSTEM:-}" = "MINGW64" ])
 then
     # Only assign this for msys, cygwin use standard Unix paths

virtualenvwrapper/user_scripts.py

@@ -23,7 +23,7 @@
     script_folder = 'Scripts'
 else:
     is_msys = False
-    script_folder = 'bin'
+    script_folder = 'usr/local/bin'
 
 
 def _get_msys_shell():