diff options
| -rw-r--r-- | CHANGELOG.txt | 21 | ||||
| -rw-r--r-- | CONTRIBUTORS | 2 | ||||
| -rw-r--r-- | setup.py | 6 | ||||
| -rw-r--r-- | tox/__init__.py | 2 | ||||
| -rw-r--r-- | tox/_venv.py | 2 | ||||
| -rw-r--r-- | toxbootstrap.py | 8 |
6 files changed, 25 insertions, 16 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 544e2c0..9f5c933 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,20 +1,23 @@ 1.0.dev ----------------- -- 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 -- 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 - +- 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 0.9 ----------------- diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 5586ed9..74a1047 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -2,5 +2,5 @@ contributions (under the MIT license): Sridhar Ratnakumar -Jannis Leidl Chris Rose +Jannis Leidl @@ -27,13 +27,13 @@ http://codespeak.net/tox def main(): - install_requires=['virtualenv>=1.6'] + install_requires=['virtualenv>=1.6.1'] setup( name='tox', description='virtualenv-based automation of test activities', long_description=long_description, url='http://codespeak.net/tox', - version='1.0.dev1', + version='1.0.dev3', license='GPLv2 or later', platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'], author='holger krekel', @@ -57,4 +57,4 @@ def main(): ) if __name__ == '__main__': - main()
\ No newline at end of file + main() diff --git a/tox/__init__.py b/tox/__init__.py index ccdae2d..85b0fa3 100644 --- a/tox/__init__.py +++ b/tox/__init__.py @@ -1,5 +1,5 @@ # -__version__ = '1.0.dev1' +__version__ = '1.0.dev3' class exception: class Error(Exception): diff --git a/tox/_venv.py b/tox/_venv.py index fa0cbf9..597ab2c 100644 --- a/tox/_venv.py +++ b/tox/_venv.py @@ -169,7 +169,7 @@ class VirtualEnv(object): try: basepath.chdir() args.append(self.path.basename) - self._pcall(args, venv=False) + self._pcall(args) #, venv=False) #if self._ispython3(): # self.easy_install(["-U", "distribute"]) finally: diff --git a/toxbootstrap.py b/toxbootstrap.py index 9c810f6..39fb2f6 100644 --- a/toxbootstrap.py +++ b/toxbootstrap.py @@ -58,7 +58,7 @@ ToDo """ -__version__ = '1.0.dev1' +__version__ = '1.0.dev3' import sys import os @@ -194,6 +194,12 @@ def cmdline(argv=None): # 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' |