Hello community, here is the log from the commit of package python3-tox for openSUSE:Factory checked in at 2015-10-02 09:23:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-tox (Old) and /work/SRC/openSUSE:Factory/.python3-tox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python3-tox" Changes: -------- --- /work/SRC/openSUSE:Factory/python3-tox/python3-tox.changes 2015-06-23 11:59:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python3-tox.new/python3-tox.changes 2015-10-02 09:23:32.000000000 +0200 @@ -1,0 +2,9 @@ +Fri Aug 14 10:35:30 UTC 2015 - [email protected] + +- Update to version 2.1.1 + * fix platform skipping for detox + * report skipped platforms as skips in the summary +- Fix build on Factory +- Disable tests for now; require network + +------------------------------------------------------------------- Old: ---- tox-2.1.0.tar.gz New: ---- tox-2.1.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-tox.spec ++++++ --- /var/tmp/diff_new_pack.GJEl28/_old 2015-10-02 09:23:33.000000000 +0200 +++ /var/tmp/diff_new_pack.GJEl28/_new 2015-10-02 09:23:33.000000000 +0200 @@ -17,7 +17,7 @@ Name: python3-tox -Version: 2.1.0 +Version: 2.1.1 Release: 0 Summary: Virtualenv-based automation of test activities License: MIT @@ -76,8 +76,9 @@ ln -sf %{_sysconfdir}/alternatives/$B %{buildroot}/%{_bindir}/$B done -%check -PATH=%{buildroot}%{_bindir}:$PATH PYTHONPATH=%{buildroot}%{python3_sitelib}/ py.test +# The tests require python 3.3 +#%check +#PATH=%{buildroot}%{_bindir}:$PATH PYTHONPATH=%{buildroot}%{python3_sitelib}/ py.test %post update-alternatives \ ++++++ tox-2.1.0.tar.gz -> tox-2.1.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tox-2.1.0/CHANGELOG new/tox-2.1.1/CHANGELOG --- old/tox-2.1.0/CHANGELOG 2015-06-19 15:26:25.000000000 +0200 +++ new/tox-2.1.1/CHANGELOG 2015-06-23 12:30:41.000000000 +0200 @@ -1,3 +1,10 @@ +2.1.1 +---------- + +- fix platform skipping for detox + +- report skipped platforms as skips in the summary + 2.1.0 ---------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tox-2.1.0/PKG-INFO new/tox-2.1.1/PKG-INFO --- old/tox-2.1.0/PKG-INFO 2015-06-19 15:26:25.000000000 +0200 +++ new/tox-2.1.1/PKG-INFO 2015-06-23 12:30:42.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: tox -Version: 2.1.0 +Version: 2.1.1 Summary: virtualenv-based automation of test activities Home-page: http://tox.testrun.org/ Author: holger krekel diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tox-2.1.0/setup.py new/tox-2.1.1/setup.py --- old/tox-2.1.0/setup.py 2015-06-19 15:26:25.000000000 +0200 +++ new/tox-2.1.1/setup.py 2015-06-23 12:30:41.000000000 +0200 @@ -48,7 +48,7 @@ description='virtualenv-based automation of test activities', long_description=open("README.rst").read(), url='http://tox.testrun.org/', - version='2.1.0', + version='2.1.1', license='http://opensource.org/licenses/MIT', platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'], author='holger krekel', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tox-2.1.0/tests/test_venv.py new/tox-2.1.1/tests/test_venv.py --- old/tox-2.1.0/tests/test_venv.py 2015-06-19 15:26:25.000000000 +0200 +++ new/tox-2.1.1/tests/test_venv.py 2015-06-23 12:30:41.000000000 +0200 @@ -473,31 +473,24 @@ class TestVenvTest: - def test_patchPATH(self, newmocksession, monkeypatch): + def test_envbinddir_path(self, newmocksession, monkeypatch): monkeypatch.setenv("PIP_RESPECT_VIRTUALENV", "1") mocksession = newmocksession([], """ [testenv:python] commands=abc """) venv = mocksession.getenv("python") - envconfig = venv.envconfig monkeypatch.setenv("PATH", "xyz") - oldpath = venv.patchPATH() - assert oldpath == "xyz" - res = os.environ['PATH'] - assert res == "%s%sxyz" % (envconfig.envbindir, os.pathsep) - p = "xyz" + os.pathsep + str(envconfig.envbindir) - monkeypatch.setenv("PATH", p) - venv.patchPATH() - res = os.environ['PATH'] - assert res == "%s%s%s" % (envconfig.envbindir, os.pathsep, p) + l = [] + monkeypatch.setattr("py.path.local.sysfind", classmethod( + lambda *args, **kwargs: l.append(kwargs) or 0 / 0)) - assert envconfig.commands - monkeypatch.setattr(venv, '_pcall', lambda *args, **kwargs: 0 / 0) py.test.raises(ZeroDivisionError, "venv._install(list('123'))") + assert l.pop()["paths"] == [venv.envconfig.envbindir] py.test.raises(ZeroDivisionError, "venv.test()") + assert l.pop()["paths"] == [venv.envconfig.envbindir] py.test.raises(ZeroDivisionError, "venv.run_install_command(['qwe'])") - py.test.raises(ZeroDivisionError, "venv._pcall([1,2,3])") + assert l.pop()["paths"] == [venv.envconfig.envbindir] monkeypatch.setenv("PIP_RESPECT_VIRTUALENV", "1") monkeypatch.setenv("PIP_REQUIRE_VIRTUALENV", "1") monkeypatch.setenv("__PYVENV_LAUNCHER__", "1") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tox-2.1.0/tests/test_z_cmdline.py new/tox-2.1.1/tests/test_z_cmdline.py --- old/tox-2.1.0/tests/test_z_cmdline.py 2015-06-19 15:26:25.000000000 +0200 +++ new/tox-2.1.1/tests/test_z_cmdline.py 2015-06-23 12:30:41.000000000 +0200 @@ -263,12 +263,9 @@ }) result = cmd.run("tox") assert not result.ret - assert "platform mismatch" not in result.stdout.str() - result = cmd.run("tox", "-v") - assert not result.ret - result.stdout.fnmatch_lines([ - "*python*platform mismatch*" - ]) + result.stdout.fnmatch_lines(""" + SKIPPED*platform mismatch* + """) def test_skip_unknown_interpreter(cmd, initproj): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tox-2.1.0/tox/__init__.py new/tox-2.1.1/tox/__init__.py --- old/tox-2.1.0/tox/__init__.py 2015-06-19 15:26:25.000000000 +0200 +++ new/tox-2.1.1/tox/__init__.py 2015-06-23 12:30:41.000000000 +0200 @@ -1,5 +1,5 @@ # -__version__ = '2.1.0' +__version__ = '2.1.1' from .hookspecs import hookspec, hookimpl # noqa diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tox-2.1.0/tox/session.py new/tox-2.1.1/tox/session.py --- old/tox-2.1.0/tox/session.py 2015-06-19 15:26:25.000000000 +0200 +++ new/tox-2.1.1/tox/session.py 2015-06-23 12:30:41.000000000 +0200 @@ -421,6 +421,9 @@ path.ensure(dir=1) def setupenv(self, venv): + if not venv.matching_platform(): + venv.status = "platform mismatch" + return # we simply omit non-matching platforms action = self.newaction(venv, "getenv", venv.envconfig.envdir) with action: venv.status = 0 @@ -518,9 +521,6 @@ if self.config.option.sdistonly: return for venv in self.venvlist: - if not venv.matching_platform(): - venv.status = "platform mismatch" - continue # we simply omit non-matching platforms if self.setupenv(venv): if venv.envconfig.usedevelop: self.developpkg(venv, self.config.setupdir) @@ -569,7 +569,7 @@ self.report.error(msg) elif status == "platform mismatch": msg = " %s: %s" % (venv.envconfig.envname, str(status)) - self.report.verbosity1(msg) + self.report.skip(msg) elif status and status != "skipped tests": msg = " %s: %s" % (venv.envconfig.envname, str(status)) self.report.error(msg) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tox-2.1.0/tox/venv.py new/tox-2.1.1/tox/venv.py --- old/tox-2.1.0/tox/venv.py 2015-06-19 15:26:25.000000000 +0200 +++ new/tox-2.1.1/tox/venv.py 2015-06-23 12:30:41.000000000 +0200 @@ -366,21 +366,13 @@ os.environ.pop(name, None) cwd.ensure(dir=1) - old = self.patchPATH() - try: - args[0] = self.getcommandpath(args[0], venv, cwd) - env = self._getenv(testcommand=testcommand) - return action.popen(args, cwd=cwd, env=env, - redirect=redirect, ignore_ret=ignore_ret) - finally: - os.environ['PATH'] = old - - def patchPATH(self): - oldPATH = os.environ['PATH'] + args[0] = self.getcommandpath(args[0], venv, cwd) + env = self._getenv(testcommand=testcommand) bindir = str(self.envconfig.envbindir) - os.environ['PATH'] = os.pathsep.join([bindir, oldPATH]) - self.session.report.verbosity2("setting PATH=%s" % os.environ["PATH"]) - return oldPATH + env['PATH'] = p = os.pathsep.join([bindir, os.environ["PATH"]]) + self.session.report.verbosity2("setting PATH=%s" % p) + return action.popen(args, cwd=cwd, env=env, + redirect=redirect, ignore_ret=ignore_ret) def getdigest(path): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tox-2.1.0/tox.egg-info/PKG-INFO new/tox-2.1.1/tox.egg-info/PKG-INFO --- old/tox-2.1.0/tox.egg-info/PKG-INFO 2015-06-19 15:26:25.000000000 +0200 +++ new/tox-2.1.1/tox.egg-info/PKG-INFO 2015-06-23 12:30:42.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: tox -Version: 2.1.0 +Version: 2.1.1 Summary: virtualenv-based automation of test activities Home-page: http://tox.testrun.org/ Author: holger krekel ++++++ tox-disable-env-tests.patch ++++++ ++++ 740 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/python3-tox/tox-disable-env-tests.patch ++++ and /work/SRC/openSUSE:Factory/.python3-tox.new/tox-disable-env-tests.patch
