2 new commits in tox: https://bitbucket.org/hpk42/tox/commits/b0f2d6e1ddd5/ Changeset: b0f2d6e1ddd5 User: hpk42 Date: 2013-04-05 22:16:39 Summary: doc fixes Affected #: 2 files
diff -r 251c2898360aa903bf6126dbcc364063e2a9d6b5 -r b0f2d6e1ddd57070701a31365f4dc0344846c2d7 doc/conf.py --- a/doc/conf.py +++ b/doc/conf.py @@ -41,7 +41,7 @@ # General information about the project. project = u'tox' -copyright = u'2011, holger krekel and others' +copyright = u'2013, holger krekel and others' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the diff -r 251c2898360aa903bf6126dbcc364063e2a9d6b5 -r b0f2d6e1ddd57070701a31365f4dc0344846c2d7 doc/index.txt --- a/doc/index.txt +++ b/doc/index.txt @@ -1,7 +1,7 @@ Welcome to the tox automation project =============================================== -.. note:: Upcoming: `professional testing with pytest and tox <`http://www.python-academy.com/courses/specialtopics/python_course_testing.html>`_ , 24th-26th June 2013, Leipzig. +.. note:: Upcoming: `professional testing with pytest and tox <http://www.python-academy.com/courses/specialtopics/python_course_testing.html>`_ , 24th-26th June 2013, Leipzig. vision: standardize testing in Python --------------------------------------------- https://bitbucket.org/hpk42/tox/commits/2bedb02425da/ Changeset: 2bedb02425da User: hpk42 Date: 2013-04-05 22:44:32 Summary: fix issue92 envsitepackagesdir to work correctly. Also fix the test. Affected #: 6 files diff -r b0f2d6e1ddd57070701a31365f4dc0344846c2d7 -r 2bedb02425da0785e6fab7a663bece85dc498299 CHANGELOG --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ 1.5.0.dev ----------------- +- fix issue92 - fix {envsitepackagesdir} to actually work again + - re-license tox to MIT license - depend on virtualenv-1.9.1 diff -r b0f2d6e1ddd57070701a31365f4dc0344846c2d7 -r 2bedb02425da0785e6fab7a663bece85dc498299 setup.py --- a/setup.py +++ b/setup.py @@ -49,7 +49,7 @@ description='virtualenv-based automation of test activities', long_description=long_description, url='http://tox.testrun.org/', - version='1.5.0.dev1', + version='1.5.dev6', license='http://opensource.org/licenses/MIT', platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'], author='holger krekel', diff -r b0f2d6e1ddd57070701a31365f4dc0344846c2d7 -r 2bedb02425da0785e6fab7a663bece85dc498299 tests/test_z_cmdline.py --- a/tests/test_z_cmdline.py +++ b/tests/test_z_cmdline.py @@ -448,12 +448,16 @@ sdist_path = session.sdist() assert sdist_path == p -@pytest.mark.xfailif("sys.platform == 'win32'") +@pytest.mark.xfail("sys.platform == 'win32'", reason="test needs better impl") def test_envsitepackagesdir(cmd, initproj): initproj("pkg512-0.0.5", filedefs={ 'tox.ini': """ + [testenv] commands= - grep '__version__.*=.*0\.0\.5' {envsitepackagesdir}/pkg512/__init__.py + echo X:{envsitepackagesdir} """}) result = cmd.run("tox") - + assert result.ret == 0 + result.stdout.fnmatch_lines(""" + X:*site-packages* + """) diff -r b0f2d6e1ddd57070701a31365f4dc0344846c2d7 -r 2bedb02425da0785e6fab7a663bece85dc498299 tox/__init__.py --- a/tox/__init__.py +++ b/tox/__init__.py @@ -1,5 +1,5 @@ # -__version__ = '1.5.0.dev1' +__version__ = '1.5.dev6' class exception: class Error(Exception): diff -r b0f2d6e1ddd57070701a31365f4dc0344846c2d7 -r 2bedb02425da0785e6fab7a663bece85dc498299 tox/_config.py --- a/tox/_config.py +++ b/tox/_config.py @@ -128,6 +128,7 @@ name = "python" return self.envbindir.join(name) + # no @property to avoid early calling (see callable(subst[key]) checks) def envsitepackagesdir(self): print_envsitepackagesdir = textwrap.dedent(""" import sys @@ -490,7 +491,7 @@ raise tox.exception.ConfigError( "substitution key %r not found" % key) - if py.builtin.callable(val): + elif py.builtin.callable(val): val = val() return str(val) @@ -527,7 +528,10 @@ if sub_key not in self._subs: raise tox.exception.ConfigError( "substitution key %r not found" % sub_key) - return '"%s"' % str(self._subs[sub_key]).replace('"', r'\"') + val = self._subs[sub_key] + if py.builtin.callable(val): + val = val() + return '"%s"' % str(val).replace('"', r'\"') def _is_bare_posargs(self, groupdict): return groupdict.get('substitution_value', None) == 'posargs' \ diff -r b0f2d6e1ddd57070701a31365f4dc0344846c2d7 -r 2bedb02425da0785e6fab7a663bece85dc498299 toxbootstrap.py --- a/toxbootstrap.py +++ b/toxbootstrap.py @@ -58,7 +58,7 @@ """ -__version__ = '1.4.3.dev6' +__version__ = '1.5.0.dev2' import sys import os Repository URL: https://bitbucket.org/hpk42/tox/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. _______________________________________________ pytest-commit mailing list pytest-commit@python.org http://mail.python.org/mailman/listinfo/pytest-commit
