Commits

holger krekel committed 17c0fb2

hopefully fixes failing windows tests

Comments (0)

Files changed (7)

 clean:
 	-rm -rf $(BUILDDIR)/*
 
-install: clean html
-	rsync -avz $(BUILDDIR)/html/ code:www-tox/
-
+install: clean html 
+	@rsync -avz $(BUILDDIR)/html/ testrun.org:www-tox/latest
+    #latexpdf
+	#@scp $(BUILDDIR)/latex/*.pdf testrun.org:www-tox/latest
 
 html:
 	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
 
 For more information, docs and many examples please checkout the `home page`_:
 
-    http://tox.readthedocs.org
+    http://codespeak.net/~hpk/tox
 
-.. _`home page`: http://tox.readthedocs.org
+.. _`home page`: http://codespeak.net/~hpk/tox
 """
 
 
         description='virtualenv-based automation of test activities',
         long_description=long_description,
         url='http://codespeak.net/tox',
-        version='1.2.dev3',
+        version='1.2.dev4',
         license='GPLv2 or later',
         platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
         author='holger krekel',
     testrun = http://pypi.testrun.org
     pypi = http://pypi.python.org/simple
 
+[testenv:X]
+commands=echo {posargs}
+
 [testenv]
 commands=py.test --junitxml={envlogdir}/junit-{envname}.xml []
 deps=pytest
 #
-__version__ = '1.2.dev3'
+__version__ = '1.2.dev4'
 
 class exception:
     class Error(Exception):
     def _processcommand(self, command):
         posargs = self._subs.get('_posargs', None)
 
-        expression = r'\{(?:(?P<sub_type>[^:]+):)?(?P<substitution_value>.*)\}'
+        expression = r'\{(?:(?P<sub_type>[^:]+):?)?(?P<substitution_value>.*)\}'
 
         words = list(CommandParser(command).words())
 
         config_interpreter = self.getsupportedinterpreter()
         f, path, _ = py.std.imp.find_module("virtualenv")
         f.close()
-        venvscript = path.strip("co")
+        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:
 
 """
 
-__version__ = '1.2.dev3'
+__version__ = '1.2.dev4'
 
 import sys
 import os