Commits

Ronny Pfannschmidt  committed d9dfd87 Merge

merge with upstream

  • Participants
  • Parent commits e4152a7, e7e075c

Comments (0)

Files changed (4)

File CHANGELOG.txt

 1.0.dev
 -----------------
 
-- require virtualenv-1.5.1 as to make pypy-1.4 work
+- 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 issue20: document format of URLs for specifying dependencies
 - 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.
 
 0.9
 -----------------
 
 have fun,
 
-holger krekel, July 2010
+holger krekel, April 2011
 

File tox/__init__.py

 #
 __version__ = '1.0.dev1'
 
-from py.apipkg import initpkg
+class exception:
+    class Error(Exception):
+        def __str__(self):
+            return "%s: %s" %(self.__class__.__name__, self.args[0])
+    class ConfigError(Error):
+        """ error in tox configuration. """
+    class UnsupportedInterpreter(Error):
+        "signals an unsupported Interpreter"
+    class InterpreterNotFound(Error):
+        "signals that an interpreter could not be found"
+    class InvocationError(Error):
+        """ an error while invoking a script. """
+    class MissingFile(Error):
+        """ an error while invoking a script. """
+    class MissingDirectory(Error):
+        """ a directory did not exist. """
+    class MissingDependency(Error):
+        """ a dependency could not be found or determined. """
 
-initpkg(__name__, dict(
-    cmdline   = '._cmdline:main',
-    exception = dict(
-        ConfigError = '._config:ConfigError',
-        InvocationError = '._exception:InvocationError',
-        MissingDependency= '._exception:MissingDependency',
-        UnsupportedInterpreter = '._exception:UnsupportedInterpreter',
-        InterpreterNotFound = '._exception:InterpreterNotFound',
-        MissingFile = '._exception:MissingFile',
-        MissingDirectory = '._exception:MissingDirectory',
-    )
-))
+from tox._cmdline import main as cmdline

File tox/_config.py

         self.envconfigs = {}
         self.invocationcwd = py.path.local()
 
-class ConfigError(Exception):
-    """ error in tox configuration. """
-
 class VenvConfig:
     def __init__(self, **kw):
         self.__dict__.update(kw)