6 new commits in tox: https://bitbucket.org/hpk42/tox/commits/cc81cfe2aaa2/ Changeset: cc81cfe2aaa2 User: hpk42 Date: 2013-12-09 15:28:06 Summary: remove training note Affected #: 3 files
diff -r df22328d1c854b0529f461d7813b443ee108aa35 -r cc81cfe2aaa2f02d8b1c71bfa8c180c172fd24da CHANGELOG --- a/CHANGELOG +++ b/CHANGELOG @@ -3,7 +3,7 @@ - drop Python2.5 compatibility because it became too hard due to the setuptools-2.0 dropping support. tox now has no - support for creating python2.5 virtualenv environments anymore. + support for creating python2.5 based environments anymore. - merged PR81: new option --force-dep which allows to override tox.ini specified dependencies in setuptools-style. diff -r df22328d1c854b0529f461d7813b443ee108aa35 -r cc81cfe2aaa2f02d8b1c71bfa8c180c172fd24da doc/index.txt --- a/doc/index.txt +++ b/doc/index.txt @@ -1,8 +1,6 @@ Welcome to the tox automation project =============================================== -.. note:: second training: `professional testing with Python <http://www.python-academy.com/courses/specialtopics/python_course_testing.html>`_ , 25-27th November 2013, Leipzig. - vision: standardize testing in Python --------------------------------------------- diff -r df22328d1c854b0529f461d7813b443ee108aa35 -r cc81cfe2aaa2f02d8b1c71bfa8c180c172fd24da tests/test_config.py --- a/tests/test_config.py +++ b/tests/test_config.py @@ -868,7 +868,7 @@ assert str(env.basepython) == sys.executable def test_default_environments(self, tmpdir, newconfig, monkeypatch): - envs = "py24,py25,py26,py27,py31,py32,jython,pypy" + envs = "py26,py27,py31,py32,py33,jython,pypy" inisource = """ [tox] envlist = %s https://bitbucket.org/hpk42/tox/commits/86efef4769cb/ Changeset: 86efef4769cb User: hpk42 Date: 2013-12-09 15:54:19 Summary: introduce --no-network switch for running tests Affected #: 4 files diff -r cc81cfe2aaa2f02d8b1c71bfa8c180c172fd24da -r 86efef4769cbbf7b823d87c08cce92238d3b67fd CHANGELOG --- a/CHANGELOG +++ b/CHANGELOG @@ -3,7 +3,8 @@ - drop Python2.5 compatibility because it became too hard due to the setuptools-2.0 dropping support. tox now has no - support for creating python2.5 based environments anymore. + support for creating python2.5 based environments anymore + and all internal special-handling has been removed. - merged PR81: new option --force-dep which allows to override tox.ini specified dependencies in setuptools-style. @@ -23,8 +24,7 @@ - fix issue126: depend on virtualenv>=1.10.1 so that we can rely (hopefully) on a pip version which supports --pre. (tox by default - uses to --pre). Note that tox also vendors an older virtualenv - for supporting python2.5 -- although the latter will be dropped at some point. + uses to --pre). - fix issue130: you can now set install_command=easy_install {opts} {packages} and expect it to work for repeated tox runs (previously it only worked @@ -44,6 +44,9 @@ - make sure that the --installpkg option trumps any usedevelop settings in tox.ini or +- introduce --no-network to tox's own test suite to skip tests + requiring networks + 1.6.1 ----- diff -r cc81cfe2aaa2f02d8b1c71bfa8c180c172fd24da -r 86efef4769cbbf7b823d87c08cce92238d3b67fd tests/test_venv.py --- a/tests/test_venv.py +++ b/tests/test_venv.py @@ -307,11 +307,11 @@ def test_install_python3(tmpdir, newmocksession): - if not py.path.local.sysfind('python3.1'): - py.test.skip("needs python3.1") + if not py.path.local.sysfind('python3.3'): + pytest.skip("needs python3.3") mocksession = newmocksession([], """ [testenv:py123] - basepython=python3.1 + basepython=python3.3 deps= dep1 dep2 diff -r cc81cfe2aaa2f02d8b1c71bfa8c180c172fd24da -r 86efef4769cbbf7b823d87c08cce92238d3b67fd tox.ini --- a/tox.ini +++ b/tox.ini @@ -23,4 +23,4 @@ [pytest] rsyncdirs=tests tox - +addopts = -rsxXf diff -r cc81cfe2aaa2f02d8b1c71bfa8c180c172fd24da -r 86efef4769cbbf7b823d87c08cce92238d3b67fd tox/_pytestplugin.py --- a/tox/_pytestplugin.py +++ b/tox/_pytestplugin.py @@ -16,6 +16,12 @@ if 'HUDSON_URL' in os.environ: del os.environ['HUDSON_URL'] + +def pytest_addoption(parser): + parser.addoption("--no-network", action="store_true", + dest="no_network", + help="don't run tests requiring network") + def pytest_report_header(): return "tox comes from: %r" % (tox.__file__) @@ -37,6 +43,8 @@ @pytest.fixture def cmd(request): + if request.config.option.no_network: + pytest.skip("--no-network was specified, test cannot run") return Cmd(request) class ReportExpectMock: @@ -156,6 +164,7 @@ self.request = request current = py.path.local() self.request.addfinalizer(current.chdir) + def chdir(self, target): target.chdir() https://bitbucket.org/hpk42/tox/commits/fa1bd914f24f/ Changeset: fa1bd914f24f User: hpk42 Date: 2013-12-09 16:06:00 Summary: introduce --sitepackages to force sitepackages=True in all environments. Was wanted by Debian maintainer Barry Warsaw. Affected #: 3 files diff -r 86efef4769cbbf7b823d87c08cce92238d3b67fd -r fa1bd914f24f3d45677ee97d93256820675667c5 CHANGELOG --- a/CHANGELOG +++ b/CHANGELOG @@ -47,6 +47,9 @@ - introduce --no-network to tox's own test suite to skip tests requiring networks +- introduce --sitepackages to force sitepackages=True in all + environments. + 1.6.1 ----- diff -r 86efef4769cbbf7b823d87c08cce92238d3b67fd -r fa1bd914f24f3d45677ee97d93256820675667c5 tests/test_config.py --- a/tests/test_config.py +++ b/tests/test_config.py @@ -451,6 +451,11 @@ # hashseed is random by default, so we can't assert a specific value. assert int_hashseed > 0 + def test_sitepackages_switch(self, tmpdir, newconfig): + config = newconfig(["--sitepackages"], "") + envconfig = config.envconfigs['python'] + assert envconfig.sitepackages == True + def test_installpkg_tops_develop(self, newconfig): config = newconfig(["--installpkg=abc"], """ [testenv] diff -r 86efef4769cbbf7b823d87c08cce92238d3b67fd -r fa1bd914f24f3d45677ee97d93256820675667c5 tox/_config.py --- a/tox/_config.py +++ b/tox/_config.py @@ -129,7 +129,10 @@ metavar="REQ", default=None, help="Forces a certain version of one of the dependencies " "when configuring the virtual environment. REQ Examples " - "'pytest<2.4' or 'django>=1.6'.") + "'pytest<2.7' or 'django>=1.6'.") + parser.add_argument("--sitepackages", action="store_true", + help="override sitepackages setting to True in all envs") + parser.add_argument("args", nargs="*", help="additional arguments available to command positional substitution") return parser @@ -355,7 +358,9 @@ name = self._replace_forced_dep(name, config) vc.deps.append(DepConfig(name, ixserver)) vc.distribute = reader.getbool(section, "distribute", False) - vc.sitepackages = reader.getbool(section, "sitepackages", False) + vc.sitepackages = self.config.option.sitepackages or \ + reader.getbool(section, "sitepackages", False) + vc.downloadcache = None downloadcache = reader.getdefault(section, "downloadcache") if downloadcache: https://bitbucket.org/hpk42/tox/commits/1265c6c42428/ Changeset: 1265c6c42428 User: hpk42 Date: 2013-12-09 16:11:33 Summary: also remove py25calls special handling in tests Affected #: 1 file diff -r fa1bd914f24f3d45677ee97d93256820675667c5 -r 1265c6c42428761172118a3d36a853826997405f tests/test_venv.py --- a/tests/test_venv.py +++ b/tests/test_venv.py @@ -5,8 +5,6 @@ import tox._config from tox._venv import * -py25calls = int(sys.version_info[:2] == (2,5)) - #def test_global_virtualenv(capfd): # v = VirtualEnv() # l = v.list() @@ -126,13 +124,13 @@ venv = mocksession.getenv("py123") venv.create() l = mocksession._pcalls - assert len(l) == 1 + py25calls + assert len(l) == 1 distshare = venv.session.config.distshare distshare.ensure("dep1-1.0.zip") distshare.ensure("dep1-1.1.zip") venv.install_deps() - assert len(l) == 2 + py25calls + assert len(l) == 2 args = l[-1].args assert l[-1].cwd == venv.envconfig.config.toxinidir assert "pip" in str(args[0]) @@ -159,10 +157,10 @@ venv = mocksession.getenv("py123") venv.create() l = mocksession._pcalls - assert len(l) == 1 + py25calls + assert len(l) == 1 venv.install_deps() - assert len(l) == 2 + py25calls + assert len(l) == 2 args = l[-1].args assert l[-1].cwd == venv.envconfig.config.toxinidir assert "pip" in str(args[0]) @@ -187,7 +185,7 @@ venv = mocksession.getenv('py123') venv.create() l = mocksession._pcalls - assert len(l) == 1 + py25calls + assert len(l) == 1 l[:] = [] venv.install_deps() https://bitbucket.org/hpk42/tox/commits/5b8c3c2998de/ Changeset: 5b8c3c2998de User: hpk42 Date: 2013-12-09 16:16:36 Summary: bump to 1.7.0.dev1 Affected #: 2 files diff -r 1265c6c42428761172118a3d36a853826997405f -r 5b8c3c2998de37c0773613666c88beb92a2cd740 setup.py --- a/setup.py +++ b/setup.py @@ -28,7 +28,7 @@ description='virtualenv-based automation of test activities', long_description=open("README.rst").read(), url='http://tox.testrun.org/', - version='1.6.2.dev2', + version='1.7.0.dev1', license='http://opensource.org/licenses/MIT', platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'], author='holger krekel', diff -r 1265c6c42428761172118a3d36a853826997405f -r 5b8c3c2998de37c0773613666c88beb92a2cd740 tox/__init__.py --- a/tox/__init__.py +++ b/tox/__init__.py @@ -1,5 +1,5 @@ # -__version__ = '1.6.2.dev2' +__version__ = '1.7.0.dev1' class exception: class Error(Exception): https://bitbucket.org/hpk42/tox/commits/d67bd930dc69/ Changeset: d67bd930dc69 User: hpk42 Date: 2013-12-09 16:28:27 Summary: fix issue105 -- don't depend on an existing HOME directory from tox tests. Affected #: 3 files diff -r 5b8c3c2998de37c0773613666c88beb92a2cd740 -r d67bd930dc6962861a361c220c665d22096d9af8 CHANGELOG --- a/CHANGELOG +++ b/CHANGELOG @@ -50,6 +50,8 @@ - introduce --sitepackages to force sitepackages=True in all environments. +- fix issue105 -- don't depend on an existing HOME directory from tox tests. + 1.6.1 ----- diff -r 5b8c3c2998de37c0773613666c88beb92a2cd740 -r d67bd930dc6962861a361c220c665d22096d9af8 tests/test_venv.py --- a/tests/test_venv.py +++ b/tests/test_venv.py @@ -117,6 +117,8 @@ def test_install_deps_wildcard(newmocksession): mocksession = newmocksession([], """ + [tox] + distshare = {toxworkdir}/distshare [testenv:py123] deps= {distshare}/dep1-* diff -r 5b8c3c2998de37c0773613666c88beb92a2cd740 -r d67bd930dc6962861a361c220c665d22096d9af8 tox/_cmdline.py --- a/tox/_cmdline.py +++ b/tox/_cmdline.py @@ -417,8 +417,13 @@ if sdistfile != sdist_path: self.report.info("copying new sdistfile to %r" % str(sdistfile)) - sdistfile.dirpath().ensure(dir=1) - sdist_path.copy(sdistfile) + try: + sdistfile.dirpath().ensure(dir=1) + except py.error.Error: + self.report.warning("could not copy distfile to %s" % + sdistfile.dirpath()) + else: + sdist_path.copy(sdistfile) return sdist_path def subcommand_test(self): 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 https://mail.python.org/mailman/listinfo/pytest-commit
