Commits

holger krekel committed bcab2f6

use --setuptools or --distribute option for virtualenv creation
depending on config variable

  • Participants
  • Parent commits f97a536

Comments (0)

Files changed (5)

+1.5.0.dev
+-----------------
+
+- depend on virtualenv-1.9.1 
+
+- use either --distribute or --setuptools depending 
+  on "distribute" env config
+
 1.4.3
 -----------------
 
 
 def main():
     version = sys.version_info[:2]
-    install_requires = ['virtualenv>=1.8.4', 'py>=1.4.12', ]
+    install_requires = ['virtualenv>=1.9.1', 'py>=1.4.13', ]
     if version < (2, 7) or (3, 0) <= version <= (3, 1):
         install_requires += ['argparse']
     setup(
         description='virtualenv-based automation of test activities',
         long_description=long_description,
         url='http://tox.testrun.org/',
-        version='1.4.3',
+        version='1.5.0.dev1',
         license='GPLv2 or later',
         platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
         author='holger krekel',

File tests/test_venv.py

     assert len(l) >= 1
     args = l[0].args
     assert "--distribute" not in map(str, args)
+    assert "--setuptools" in map(str, args)
 
 def test_create_sitepackages(monkeypatch, mocksession, newconfig):
     config = newconfig([], """

File tox/__init__.py

 #
-__version__ = '1.4.3'
+__version__ = '1.5.0.dev1'
 
 class exception:
     class Error(Exception):

File tox/_venv.py

         venvscript = path.rstrip("co")
         #venvscript = py.path.local(tox.__file__).dirpath("virtualenv.py")
         args = [config_interpreter, venvscript]
-        if not self._ispython3() and self.envconfig.distribute:
-            args.append('--distribute')
+        if self.envconfig.distribute:
+            args.append("--distribute")
+        else:
+            args.append("--setuptools")
         if self.envconfig.sitepackages:
             args.append('--system-site-packages')
         #if sys.platform == "win32":