1. holger krekel
  2. tox


offbyone  committed d8ae7b9 Merge

Merged upstream

  • Participants
  • Parent commits 675fbfb, 8e6037b
  • Branches default

Comments (0)

Files changed (8)


View file
  • Ignore whitespace
-- require virtualenv-1.6, obsoleting virtualenv5 and making pypy-1.4 work by default
-- fix issue22: use virtualenv-1.6, obsoleting virtualenv5 (thanks Jannis Leidel)
-- fix issue14: inline report errors related to test command
+- fix issue22: require virtualenv-1.6.1, obsoleting virtualenv5 (thanks Jannis Leidel)
+  and making things work with pypy-1.5 and python3 more seemlessly
+- toxbootstrap.py (used by jenkins build slaves) now follows the latest release of virtualenv
 - fix issue20: document format of URLs for specifying dependencies
 - fix issue19: substitute Hudson for Jenkins everywhere following the renaming
-  of the project.  NOTE: if you used the special [tox:jenkins]
+  of the project.  NOTE: if you used the special [tox:hudson]
   section it will now need to be named [tox:jenkins].
 - fix issue 23 / apply some ReST fixes
+- change the positional argument specifier to use {posargs:} syntax and
+  fix issues #15 and #10 by refining the argument parsing method (Chris Rose)
+- remove use of inipkg lazy importing logic - 
+  the namespace/imports are anyway very small with tox.
+- fix a fspath related assertion to work with debian installs which uses
+  symlinks
+- show path of the underlying virtualenv invocation and bootstrap
+  virtualenv.py into a working subdir 
 - added a CONTRIBUTORS file
-- change the positional argument specifier to use {posargs:} syntax
-- Fix issues #15 and #10 with changes to the argument parsing method
-  (many thanks to Chris Rose)
-- remove use inipkg lazy importing logic - 
-  the namespace/imports are anyway very small with tox.


View file
  • Ignore whitespace
 contributions (under the MIT license):
 Sridhar Ratnakumar
+Chris Rose
 Jannis Leidl
-Chris Rose

File setup.py

View file
  • Ignore whitespace
 def main():
-    install_requires=['virtualenv>=1.6']
+    install_requires=['virtualenv>=1.6.1']
         description='virtualenv-based automation of test activities',
-        version='1.0.dev1',
+        version='1.0.dev3',
         license='GPLv2 or later',
         platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
         author='holger krekel',
 if __name__ == '__main__':
-    main()
+    main()

File tests/__init__.py

  • Ignore whitespace
Empty file added.

File tests/test_venv.py

View file
  • Ignore whitespace
     """ % sys.executable)
     venv = VirtualEnv(config.envconfigs['python'], session=mocksession)
     interp = venv.getsupportedinterpreter()
-    assert interp == sys.executable
+    # realpath needed for debian symlinks
+    assert interp == py.path.local(sys.executable).realpath()
     monkeypatch.setattr(sys, 'platform', "win32")
     monkeypatch.setattr(venv.envconfig, 'basepython', 'jython')
     if sys.platform != "win32":
         i = args.index("-p")
         assert i != -1, args
-        assert sys.executable == args[i+1]
+        # realpath is needed for stuff like the debian symlinks
+        assert py.path.local(sys.executable).realpath() == args[i+1]
         #assert Envconfig.toxworkdir in args
         assert venv.getcommandpath("easy_install")
     interp = venv._getliveconfig().python

File tox/__init__.py

View file
  • Ignore whitespace
-__version__ = '1.0.dev1'
+__version__ = '1.0.dev3'
 class exception:
     class Error(Exception):

File tox/_venv.py

View file
  • Ignore whitespace
-            self._pcall(args, venv=False)
+            self._pcall(args) #, venv=False)
             #if self._ispython3():
             #    self.easy_install(["-U", "distribute"])

File toxbootstrap.py

View file
  • Ignore whitespace
-__version__ = '1.0.dev1'
+__version__ = '1.0.dev3'
 import sys
 import os
         # this should be to first look for tox in the global scripts/ directory
         run('%s virtualenv.py --no-site-packages --distribute %s' %
                 (sys.executable, TENV))
+        logging.info("removing virtualenv.py script after bootstrap venv creation")
+        for x in ('', 'o', 'c'):
+            try:
+                os.remove("virtualenv.py%s" % x)
+            except OSError:
+                pass
     assert has_script(TENV, 'python'), 'no python script'
     assert has_script(TENV, 'pip'), 'no pip script'