[Pytest-commit] [pytest-dev/pytest] afde9f: Update number of tests in email template

Bruno Oliveira nicoddemus at gmail.com
Fri May 25 18:09:15 EDT 2018


  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: afde9f07f7303511dec3b74850f0e10b1579393b
      https://github.com/pytest-dev/pytest/commit/afde9f07f7303511dec3b74850f0e10b1579393b
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M tasks/release.minor.rst

  Log Message:
  -----------
  Update number of tests in email template


  Commit: d41119ed04b4b48e0d5db74d7a4ee29192d9e6b1
      https://github.com/pytest-dev/pytest/commit/d41119ed04b4b48e0d5db74d7a4ee29192d9e6b1
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    A .pre-commit-config.yaml

  Log Message:
  -----------
  add the config


  Commit: 9aacb4635e81edd6ecf281d4f6c0cfc8e94ab301
      https://github.com/pytest-dev/pytest/commit/9aacb4635e81edd6ecf281d4f6c0cfc8e94ab301
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M _pytest/_code/code.py
    M _pytest/assertion/rewrite.py
    M _pytest/assertion/truncate.py
    M _pytest/assertion/util.py
    M _pytest/capture.py
    M _pytest/config.py
    M _pytest/fixtures.py
    M _pytest/logging.py
    M _pytest/main.py
    M _pytest/mark/legacy.py
    M _pytest/mark/structures.py
    M _pytest/outcomes.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/python_api.py
    M _pytest/recwarn.py
    M _pytest/runner.py
    M _pytest/setuponly.py
    M _pytest/skipping.py
    M doc/en/example/assertion/failure_demo.py
    M testing/acceptance_test.py
    M testing/code/test_excinfo.py
    M testing/deprecated_test.py
    M testing/logging/test_reporting.py
    M testing/python/approx.py
    M testing/python/fixture.py
    M testing/python/metafunc.py
    M testing/python/raises.py
    M testing/test_assertion.py
    M testing/test_config.py
    M testing/test_doctest.py
    M testing/test_junitxml.py
    M testing/test_mark.py
    M testing/test_parseopt.py

  Log Message:
  -----------
  run pyupgrade


  Commit: 3b9e063fe8eea19504cea1bd7764c9631d0c8019
      https://github.com/pytest-dev/pytest/commit/3b9e063fe8eea19504cea1bd7764c9631d0c8019
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M bench/manyparam.py
    M doc/en/_templates/links.html
    M doc/en/announce/release-2.0.3.rst
    M doc/en/announce/release-2.1.1.rst
    M doc/en/announce/release-2.1.2.rst
    M doc/en/announce/release-2.2.4.rst
    M doc/en/announce/release-2.3.0.rst
    M doc/en/announce/release-2.3.3.rst
    M doc/en/announce/release-2.3.5.rst
    M doc/en/announce/release-2.4.0.rst
    M doc/en/announce/release-2.5.0.rst
    M doc/en/announce/release-2.5.1.rst
    M doc/en/announce/release-2.5.2.rst
    M doc/en/announce/release-2.6.1.rst
    M doc/en/announce/release-2.6.2.rst
    M doc/en/announce/release-2.6.3.rst
    M doc/en/announce/release-2.7.0.rst
    M doc/en/announce/release-2.7.2.rst
    M doc/en/announce/release-2.8.3.rst
    M doc/en/announce/release-2.8.7.rst
    M doc/en/announce/release-2.9.0.rst
    M doc/en/bash-completion.rst
    M doc/en/builtin.rst
    M doc/en/cache.rst
    M doc/en/check_sphinx.py
    M doc/en/contact.rst
    M doc/en/contents.rst
    M doc/en/doctest.rst
    M doc/en/example/assertion/test_setup_flow_example.py
    M doc/en/example/costlysetup/sub_b/test_two.py
    M doc/en/example/py2py3/conftest.py
    M doc/en/example/py2py3/test_py2.py
    M doc/en/example/py2py3/test_py3.py
    M doc/en/example/simple.rst
    M doc/en/funcarg_compare.rst
    M doc/en/funcargs.rst
    M doc/en/mark.rst
    M doc/en/nose.rst
    M doc/en/talks.rst
    M doc/en/test/index.rst
    M doc/en/test/plugin/django.rst
    M doc/en/writing_plugins.rst
    M extra/get_issues.py
    M testing/freeze/.gitignore

  Log Message:
  -----------
  fix line endings


  Commit: b60376dc289ceae886c7d54d3c5c4074d9969791
      https://github.com/pytest-dev/pytest/commit/b60376dc289ceae886c7d54d3c5c4074d9969791
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M CONTRIBUTING.rst

  Log Message:
  -----------
  add pre-commit to CONTRIBUTING.txt


  Commit: 86fc31db8d3b5ae33d18be43efdf23ff6f2ce040
      https://github.com/pytest-dev/pytest/commit/86fc31db8d3b5ae33d18be43efdf23ff6f2ce040
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M .pre-commit-config.yaml
    M CONTRIBUTING.rst
    M changelog/README.rst
    M doc/en/_themes/flask/theme.conf
    M doc/en/announce/index.rst
    M doc/en/announce/release-2.0.3.rst
    M doc/en/announce/release-2.1.3.rst
    M doc/en/announce/release-2.2.1.rst
    M doc/en/announce/release-2.2.2.rst
    M doc/en/announce/release-2.3.0.rst
    M doc/en/announce/release-2.3.1.rst
    M doc/en/announce/release-2.3.2.rst
    M doc/en/announce/release-2.3.3.rst
    M doc/en/announce/release-2.3.4.rst
    M doc/en/announce/release-2.3.5.rst
    M doc/en/announce/release-2.4.0.rst
    M doc/en/announce/release-2.4.1.rst
    M doc/en/announce/release-2.4.2.rst
    M doc/en/announce/release-2.5.0.rst
    M doc/en/announce/release-2.5.1.rst
    M doc/en/announce/release-2.5.2.rst
    M doc/en/announce/release-2.8.3.rst
    M doc/en/announce/release-2.9.0.rst
    M doc/en/announce/release-2.9.1.rst
    M doc/en/announce/release-3.0.0.rst
    M doc/en/announce/release-3.0.1.rst
    M doc/en/announce/release-3.0.2.rst
    M doc/en/announce/release-3.0.3.rst
    M doc/en/announce/release-3.0.4.rst
    M doc/en/announce/release-3.0.5.rst
    M doc/en/announce/release-3.0.6.rst
    M doc/en/announce/release-3.0.7.rst
    M doc/en/announce/release-3.1.1.rst
    M doc/en/announce/release-3.1.2.rst
    M doc/en/announce/release-3.1.3.rst
    M doc/en/announce/release-3.2.1.rst
    M doc/en/announce/release-3.2.2.rst
    M doc/en/announce/release-3.2.3.rst
    M doc/en/announce/release-3.2.4.rst
    M doc/en/announce/release-3.2.5.rst
    M doc/en/announce/release-3.3.1.rst
    M doc/en/announce/release-3.3.2.rst
    M doc/en/announce/release-3.4.1.rst
    M doc/en/announce/release-3.4.2.rst
    M doc/en/announce/release-3.5.1.rst
    M doc/en/assert.rst
    M doc/en/builtin.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    M doc/en/contact.rst
    M doc/en/customize.rst
    M doc/en/development_guide.rst
    M doc/en/doctest.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/pythoncollection.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/fixture.rst
    M doc/en/funcarg_compare.rst
    M doc/en/genapi.py
    M doc/en/getting-started.rst
    M doc/en/index.rst
    M doc/en/monkeypatch.rst
    M doc/en/parametrize.rst
    M doc/en/skipping.rst
    M doc/en/test/config.html
    M doc/en/test/dist.html
    M doc/en/test/extend.html
    M doc/en/test/plugin/coverage.rst
    M doc/en/test/plugin/figleaf.rst
    M doc/en/test/test.html
    M doc/en/tmpdir.rst
    M doc/en/unittest.rst
    M doc/en/usage.rst
    M doc/en/warnings.rst
    M doc/en/xunit_setup.rst
    M tasks/release.patch.rst

  Log Message:
  -----------
  apply most other hooks and opt out of black reformating


  Commit: 3e1590bcfcce1a28619abc31425f407cb0459b75
      https://github.com/pytest-dev/pytest/commit/3e1590bcfcce1a28619abc31425f407cb0459b75
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M .pre-commit-config.yaml
    M _pytest/fixtures.py
    M _pytest/recwarn.py
    M testing/test_mark.py

  Log Message:
  -----------
  sort out pyupgrade fallout


  Commit: 703e4b11ba76171eccd3f13e723c47b810ded7ef
      https://github.com/pytest-dev/pytest/commit/703e4b11ba76171eccd3f13e723c47b810ded7ef
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M .pre-commit-config.yaml
    M _pytest/__init__.py
    M _pytest/_argcomplete.py
    M _pytest/_code/_py2traceback.py
    M _pytest/_code/code.py
    M _pytest/_code/source.py
    M _pytest/assertion/__init__.py
    M _pytest/assertion/rewrite.py
    M _pytest/assertion/truncate.py
    M _pytest/assertion/util.py
    M _pytest/cacheprovider.py
    M _pytest/capture.py
    M _pytest/compat.py
    M _pytest/config.py
    M _pytest/debugging.py
    M _pytest/deprecated.py
    M _pytest/doctest.py
    M _pytest/fixtures.py
    M _pytest/freeze_support.py
    M _pytest/helpconfig.py
    M _pytest/hookspec.py
    M _pytest/junitxml.py
    M _pytest/logging.py
    M _pytest/main.py
    M _pytest/mark/__init__.py
    M _pytest/mark/evaluate.py
    M _pytest/mark/legacy.py
    M _pytest/mark/structures.py
    M _pytest/monkeypatch.py
    M _pytest/nodes.py
    M _pytest/nose.py
    M _pytest/outcomes.py
    M _pytest/pastebin.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/python_api.py
    M _pytest/recwarn.py
    M _pytest/resultlog.py
    M _pytest/runner.py
    M _pytest/setuponly.py
    M _pytest/setupplan.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    M _pytest/tmpdir.py
    M _pytest/unittest.py
    M _pytest/warnings.py
    M bench/bench.py
    M bench/bench_argcomplete.py
    M bench/empty.py
    M bench/manyparam.py
    M bench/skip.py
    M doc/en/_themes/flask_theme_support.py
    M doc/en/announce/release-2.4.0.rst
    M doc/en/check_sphinx.py
    M doc/en/conf.py
    M doc/en/example/assertion/failure_demo.py
    M doc/en/example/assertion/global_testmodule_config/conftest.py
    M doc/en/example/assertion/global_testmodule_config/test_hello_world.py
    M doc/en/example/assertion/test_failures.py
    M doc/en/example/assertion/test_setup_flow_example.py
    M doc/en/example/costlysetup/conftest.py
    M doc/en/example/costlysetup/sub_a/test_quick.py
    M doc/en/example/costlysetup/sub_b/test_two.py
    M doc/en/example/multipython.py
    M doc/en/example/nonpython/conftest.py
    M doc/en/example/py2py3/conftest.py
    M doc/en/example/py2py3/test_py3.py
    M doc/en/example/pythoncollection.py
    M doc/en/example/xfail_demo.py
    M doc/en/fixture.rst
    M doc/en/genapi.py
    M extra/get_issues.py
    M pytest.py
    M scripts/check-rst.py
    M setup.py
    M tasks/__init__.py
    M tasks/generate.py
    M testing/acceptance_test.py
    M testing/code/test_code.py
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    M testing/code/test_source_multiline_block.py
    M testing/deprecated_test.py
    M testing/freeze/create_executable.py
    M testing/freeze/runtests_script.py
    M testing/freeze/tests/test_trivial.py
    M testing/freeze/tox_run.py
    M testing/logging/test_fixture.py
    M testing/logging/test_formatter.py
    M testing/logging/test_reporting.py
    M testing/python/approx.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/integration.py
    M testing/python/metafunc.py
    M testing/python/raises.py
    M testing/python/setup_only.py
    M testing/python/setup_plan.py
    M testing/python/show_fixtures_per_test.py
    M testing/python/test_deprecations.py
    M testing/test_argcomplete.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_cacheprovider.py
    M testing/test_capture.py
    M testing/test_collection.py
    M testing/test_compat.py
    M testing/test_config.py
    M testing/test_conftest.py
    M testing/test_doctest.py
    M testing/test_entry_points.py
    M testing/test_helpconfig.py
    M testing/test_junitxml.py
    M testing/test_mark.py
    M testing/test_modimport.py
    M testing/test_monkeypatch.py
    M testing/test_nodes.py
    M testing/test_nose.py
    M testing/test_parseopt.py
    M testing/test_pastebin.py
    M testing/test_pdb.py
    M testing/test_pluginmanager.py
    M testing/test_pytester.py
    M testing/test_recwarn.py
    M testing/test_resultlog.py
    M testing/test_runner.py
    M testing/test_runner_xunit.py
    M testing/test_session.py
    M testing/test_skipping.py
    M testing/test_terminal.py
    M testing/test_tmpdir.py
    M testing/test_unittest.py
    M testing/test_warnings.py

  Log Message:
  -----------
  run black


  Commit: 3e08c4ee64dffa14450ca29b1ef8bc3f820a5b2b
      https://github.com/pytest-dev/pytest/commit/3e08c4ee64dffa14450ca29b1ef8bc3f820a5b2b
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M _pytest/_code/_py2traceback.py
    M _pytest/_code/code.py
    M _pytest/compat.py
    M _pytest/fixtures.py
    M _pytest/python.py
    M _pytest/python_api.py
    M bench/bench.py
    M bench/bench_argcomplete.py
    M bench/skip.py
    M doc/en/check_sphinx.py
    M doc/en/example/assertion/failure_demo.py
    M doc/en/example/assertion/global_testmodule_config/conftest.py
    M doc/en/example/pythoncollection.py
    M extra/get_issues.py
    M testing/code/test_code.py
    M testing/python/collect.py
    M testing/test_capture.py
    M testing/test_collection.py

  Log Message:
  -----------
  sort out flake8 issues and unicode name usage


  Commit: d4bf2ff8f5f95fe63f114769af315e7080d37e3d
      https://github.com/pytest-dev/pytest/commit/d4bf2ff8f5f95fe63f114769af315e7080d37e3d
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M testing/code/test_source.py

  Log Message:
  -----------
  fix test_source


  Commit: 57a55cd0a3d9adcf5437e357aa1f65631248ca90
      https://github.com/pytest-dev/pytest/commit/57a55cd0a3d9adcf5437e357aa1f65631248ca90
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M testing/code/test_source_multiline_block.py

  Log Message:
  -----------
  restore formatting of test_source_multiline_block


  Commit: 6c519b12802347b257840c4d286ca0bf94cd92a5
      https://github.com/pytest-dev/pytest/commit/6c519b12802347b257840c4d286ca0bf94cd92a5
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M _pytest/junitxml.py
    A changelog/3491.bugfix.rst
    M testing/test_junitxml.py

  Log Message:
  -----------
  Fixed a bug where stdout and stderr were logged twice by junitxml.


  Commit: 210ad22dbe6d61a4dcfb9a1f431058e6a8c26bad
      https://github.com/pytest-dev/pytest/commit/210ad22dbe6d61a4dcfb9a1f431058e6a8c26bad
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M changelog/3491.bugfix.rst

  Log Message:
  -----------
  Updating changelog text


  Commit: b4e02656226ca74fd0676668926e20e5bceeebf0
      https://github.com/pytest-dev/pytest/commit/b4e02656226ca74fd0676668926e20e5bceeebf0
  Author: Jeffrey Rackauckas <jeffreyrack at gmail.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M testing/test_junitxml.py

  Log Message:
  -----------
  Removed whitespace from empty line.


  Commit: 74cfdc5feb9b07ff538b6c85d864437aadeb314e
      https://github.com/pytest-dev/pytest/commit/74cfdc5feb9b07ff538b6c85d864437aadeb314e
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-24 (Thu, 24 May 2018)

  Changed paths:
    M testing/test_unittest.py

  Log Message:
  -----------
  add failing test for #3498


  Commit: da2c2e8492c85b315d3cc0892a69ff2fc9c259e8
      https://github.com/pytest-dev/pytest/commit/da2c2e8492c85b315d3cc0892a69ff2fc9c259e8
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-24 (Thu, 24 May 2018)

  Changed paths:
    M testing/test_unittest.py

  Log Message:
  -----------
  more debugging for #3498


  Commit: 5a0c9aca639596b9d0bf5d909462b0435afda244
      https://github.com/pytest-dev/pytest/commit/5a0c9aca639596b9d0bf5d909462b0435afda244
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-24 (Thu, 24 May 2018)

  Changed paths:
    M _pytest/fixtures.py
    M _pytest/python.py
    M _pytest/unittest.py
    A changelog/3498.bugfix

  Log Message:
  -----------
  correctly instantiate fixtureinfo for unittest tests, fixes #3498


  Commit: 9ed1289b01f09a8f130460083c4d91d4ad6b5420
      https://github.com/pytest-dev/pytest/commit/9ed1289b01f09a8f130460083c4d91d4ad6b5420
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-24 (Thu, 24 May 2018)

  Changed paths:
    M testing/code/test_source_multiline_block.py

  Log Message:
  -----------
  run black on test_source_multiline_block.py


  Commit: bc25d51b2f59a92df28c37b436b21aa311a30913
      https://github.com/pytest-dev/pytest/commit/bc25d51b2f59a92df28c37b436b21aa311a30913
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-24 (Thu, 24 May 2018)

  Changed paths:
    M changelog/3498.bugfix

  Log Message:
  -----------
  Re-word changelog


  Commit: 6eb7af5a4edaae0d4b8afcd946f1671c9deffe0f
      https://github.com/pytest-dev/pytest/commit/6eb7af5a4edaae0d4b8afcd946f1671c9deffe0f
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-24 (Thu, 24 May 2018)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  experimentally add pre-commit for linting in travis


  Commit: df17bb2bd38a1f40bbd748c9cc7ae2c4b864949c
      https://github.com/pytest-dev/pytest/commit/df17bb2bd38a1f40bbd748c9cc7ae2c4b864949c
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-24 (Thu, 24 May 2018)

  Changed paths:
    M .pre-commit-config.yaml
    M .travis.yml
    M tox.ini

  Log Message:
  -----------
  switch linting tox env to use pre-commit, clean out travis linting env as unneeded


  Commit: 5a6a58076569292bd1ce84be514995d24c569e1d
      https://github.com/pytest-dev/pytest/commit/5a6a58076569292bd1ce84be514995d24c569e1d
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2018-05-24 (Thu, 24 May 2018)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  clean env for the linting stage


  Commit: 48215fdcb90baf9abc1f83661d9d8be3e72a4b22
      https://github.com/pytest-dev/pytest/commit/48215fdcb90baf9abc1f83661d9d8be3e72a4b22
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-24 (Thu, 24 May 2018)

  Changed paths:
    M _pytest/fixtures.py
    M _pytest/python.py
    M _pytest/unittest.py
    A changelog/3498.bugfix
    M testing/test_unittest.py

  Log Message:
  -----------
  Merge pull request #3500 from RonnyPfannschmidt/fix-3498-unittest-marks

fix #3498 - correctly consider marks on unittest classes


  Commit: 93fdad28aae28342940156701b813f6743b6e317
      https://github.com/pytest-dev/pytest/commit/93fdad28aae28342940156701b813f6743b6e317
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-24 (Thu, 24 May 2018)

  Changed paths:
    M _pytest/junitxml.py
    A changelog/3491.bugfix.rst
    M testing/test_junitxml.py

  Log Message:
  -----------
  Merge pull request #3499 from jeffreyrack/3491-junit-logging

3491 - Fixed a bug where stdout and stderr were logged twice by junitxml for xfail tests.


  Commit: c55635d42a6e6bab35307f5d728dfff0b3161901
      https://github.com/pytest-dev/pytest/commit/c55635d42a6e6bab35307f5d728dfff0b3161901
  Author: Oliver Bestwalter <oliver.bestwalter at avira.com>
  Date:   2018-05-25 (Fri, 25 May 2018)

  Changed paths:
    M doc/en/goodpractices.rst
    M doc/en/nose.rst

  Log Message:
  -----------
  Fix tox spelling (all lower case).


  Commit: 65bc43dc56d6152a2e9bd766961ad67b7b0f127c
      https://github.com/pytest-dev/pytest/commit/65bc43dc56d6152a2e9bd766961ad67b7b0f127c
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-25 (Fri, 25 May 2018)

  Changed paths:
    M doc/en/goodpractices.rst
    M doc/en/nose.rst

  Log Message:
  -----------
  Merge pull request #3505 from Avira/tox-lowercase

Fix tox spelling (all lower case).


  Commit: 6f8547cc1a516a1615bb33fcc4c9fc0fc7196731
      https://github.com/pytest-dev/pytest/commit/6f8547cc1a516a1615bb33fcc4c9fc0fc7196731
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-25 (Fri, 25 May 2018)

  Changed paths:
    M _pytest/fixtures.py
    M _pytest/junitxml.py
    M _pytest/python.py
    M _pytest/unittest.py
    A changelog/3491.bugfix.rst
    A changelog/3498.bugfix
    M doc/en/goodpractices.rst
    M doc/en/nose.rst
    M testing/test_junitxml.py
    M testing/test_unittest.py

  Log Message:
  -----------
  Merge branch 'master' into pre-commit-hook


  Commit: 1b16d649f9c43573111af19d29f34fa7330aff88
      https://github.com/pytest-dev/pytest/commit/1b16d649f9c43573111af19d29f34fa7330aff88
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-25 (Fri, 25 May 2018)

  Changed paths:
    M _pytest/junitxml.py
    M changelog/3491.bugfix.rst
    M testing/test_junitxml.py
    M testing/test_unittest.py

  Log Message:
  -----------
  Fix formatting of merged files


  Commit: 437a6fb224fefe6df8577d3299b31364372dbd14
      https://github.com/pytest-dev/pytest/commit/437a6fb224fefe6df8577d3299b31364372dbd14
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-25 (Fri, 25 May 2018)

  Changed paths:
    M README.rst

  Log Message:
  -----------
  Add "black code-style" badge


  Commit: a36bab448f4b4a88e617cdaba7e80ed03a371244
      https://github.com/pytest-dev/pytest/commit/a36bab448f4b4a88e617cdaba7e80ed03a371244
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-05-25 (Fri, 25 May 2018)

  Changed paths:
    A .pre-commit-config.yaml
    M .travis.yml
    M CONTRIBUTING.rst
    M README.rst
    M _pytest/__init__.py
    M _pytest/_argcomplete.py
    M _pytest/_code/_py2traceback.py
    M _pytest/_code/code.py
    M _pytest/_code/source.py
    M _pytest/assertion/__init__.py
    M _pytest/assertion/rewrite.py
    M _pytest/assertion/truncate.py
    M _pytest/assertion/util.py
    M _pytest/cacheprovider.py
    M _pytest/capture.py
    M _pytest/compat.py
    M _pytest/config.py
    M _pytest/debugging.py
    M _pytest/deprecated.py
    M _pytest/doctest.py
    M _pytest/fixtures.py
    M _pytest/freeze_support.py
    M _pytest/helpconfig.py
    M _pytest/hookspec.py
    M _pytest/junitxml.py
    M _pytest/logging.py
    M _pytest/main.py
    M _pytest/mark/__init__.py
    M _pytest/mark/evaluate.py
    M _pytest/mark/legacy.py
    M _pytest/mark/structures.py
    M _pytest/monkeypatch.py
    M _pytest/nodes.py
    M _pytest/nose.py
    M _pytest/outcomes.py
    M _pytest/pastebin.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/python_api.py
    M _pytest/recwarn.py
    M _pytest/resultlog.py
    M _pytest/runner.py
    M _pytest/setuponly.py
    M _pytest/setupplan.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    M _pytest/tmpdir.py
    M _pytest/unittest.py
    M _pytest/warnings.py
    M bench/bench.py
    M bench/bench_argcomplete.py
    M bench/empty.py
    M bench/manyparam.py
    M bench/skip.py
    M changelog/3491.bugfix.rst
    M changelog/README.rst
    M doc/en/_templates/links.html
    M doc/en/_themes/flask/theme.conf
    M doc/en/_themes/flask_theme_support.py
    M doc/en/announce/index.rst
    M doc/en/announce/release-2.0.3.rst
    M doc/en/announce/release-2.1.1.rst
    M doc/en/announce/release-2.1.2.rst
    M doc/en/announce/release-2.1.3.rst
    M doc/en/announce/release-2.2.1.rst
    M doc/en/announce/release-2.2.2.rst
    M doc/en/announce/release-2.2.4.rst
    M doc/en/announce/release-2.3.0.rst
    M doc/en/announce/release-2.3.1.rst
    M doc/en/announce/release-2.3.2.rst
    M doc/en/announce/release-2.3.3.rst
    M doc/en/announce/release-2.3.4.rst
    M doc/en/announce/release-2.3.5.rst
    M doc/en/announce/release-2.4.0.rst
    M doc/en/announce/release-2.4.1.rst
    M doc/en/announce/release-2.4.2.rst
    M doc/en/announce/release-2.5.0.rst
    M doc/en/announce/release-2.5.1.rst
    M doc/en/announce/release-2.5.2.rst
    M doc/en/announce/release-2.6.1.rst
    M doc/en/announce/release-2.6.2.rst
    M doc/en/announce/release-2.6.3.rst
    M doc/en/announce/release-2.7.0.rst
    M doc/en/announce/release-2.7.2.rst
    M doc/en/announce/release-2.8.3.rst
    M doc/en/announce/release-2.8.7.rst
    M doc/en/announce/release-2.9.0.rst
    M doc/en/announce/release-2.9.1.rst
    M doc/en/announce/release-3.0.0.rst
    M doc/en/announce/release-3.0.1.rst
    M doc/en/announce/release-3.0.2.rst
    M doc/en/announce/release-3.0.3.rst
    M doc/en/announce/release-3.0.4.rst
    M doc/en/announce/release-3.0.5.rst
    M doc/en/announce/release-3.0.6.rst
    M doc/en/announce/release-3.0.7.rst
    M doc/en/announce/release-3.1.1.rst
    M doc/en/announce/release-3.1.2.rst
    M doc/en/announce/release-3.1.3.rst
    M doc/en/announce/release-3.2.1.rst
    M doc/en/announce/release-3.2.2.rst
    M doc/en/announce/release-3.2.3.rst
    M doc/en/announce/release-3.2.4.rst
    M doc/en/announce/release-3.2.5.rst
    M doc/en/announce/release-3.3.1.rst
    M doc/en/announce/release-3.3.2.rst
    M doc/en/announce/release-3.4.1.rst
    M doc/en/announce/release-3.4.2.rst
    M doc/en/announce/release-3.5.1.rst
    M doc/en/assert.rst
    M doc/en/bash-completion.rst
    M doc/en/builtin.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    M doc/en/check_sphinx.py
    M doc/en/conf.py
    M doc/en/contact.rst
    M doc/en/contents.rst
    M doc/en/customize.rst
    M doc/en/development_guide.rst
    M doc/en/doctest.rst
    M doc/en/example/assertion/failure_demo.py
    M doc/en/example/assertion/global_testmodule_config/conftest.py
    M doc/en/example/assertion/global_testmodule_config/test_hello_world.py
    M doc/en/example/assertion/test_failures.py
    M doc/en/example/assertion/test_setup_flow_example.py
    M doc/en/example/costlysetup/conftest.py
    M doc/en/example/costlysetup/sub_a/test_quick.py
    M doc/en/example/costlysetup/sub_b/test_two.py
    M doc/en/example/markers.rst
    M doc/en/example/multipython.py
    M doc/en/example/nonpython.rst
    M doc/en/example/nonpython/conftest.py
    M doc/en/example/parametrize.rst
    M doc/en/example/py2py3/conftest.py
    M doc/en/example/py2py3/test_py2.py
    M doc/en/example/py2py3/test_py3.py
    M doc/en/example/pythoncollection.py
    M doc/en/example/pythoncollection.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/example/xfail_demo.py
    M doc/en/fixture.rst
    M doc/en/funcarg_compare.rst
    M doc/en/funcargs.rst
    M doc/en/genapi.py
    M doc/en/getting-started.rst
    M doc/en/index.rst
    M doc/en/mark.rst
    M doc/en/monkeypatch.rst
    M doc/en/nose.rst
    M doc/en/parametrize.rst
    M doc/en/skipping.rst
    M doc/en/talks.rst
    M doc/en/test/config.html
    M doc/en/test/dist.html
    M doc/en/test/extend.html
    M doc/en/test/index.rst
    M doc/en/test/plugin/coverage.rst
    M doc/en/test/plugin/django.rst
    M doc/en/test/plugin/figleaf.rst
    M doc/en/test/test.html
    M doc/en/tmpdir.rst
    M doc/en/unittest.rst
    M doc/en/usage.rst
    M doc/en/warnings.rst
    M doc/en/writing_plugins.rst
    M doc/en/xunit_setup.rst
    M extra/get_issues.py
    M pytest.py
    M scripts/check-rst.py
    M setup.py
    M tasks/__init__.py
    M tasks/generate.py
    M tasks/release.patch.rst
    M testing/acceptance_test.py
    M testing/code/test_code.py
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    M testing/code/test_source_multiline_block.py
    M testing/deprecated_test.py
    M testing/freeze/.gitignore
    M testing/freeze/create_executable.py
    M testing/freeze/runtests_script.py
    M testing/freeze/tests/test_trivial.py
    M testing/freeze/tox_run.py
    M testing/logging/test_fixture.py
    M testing/logging/test_formatter.py
    M testing/logging/test_reporting.py
    M testing/python/approx.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/integration.py
    M testing/python/metafunc.py
    M testing/python/raises.py
    M testing/python/setup_only.py
    M testing/python/setup_plan.py
    M testing/python/show_fixtures_per_test.py
    M testing/python/test_deprecations.py
    M testing/test_argcomplete.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_cacheprovider.py
    M testing/test_capture.py
    M testing/test_collection.py
    M testing/test_compat.py
    M testing/test_config.py
    M testing/test_conftest.py
    M testing/test_doctest.py
    M testing/test_entry_points.py
    M testing/test_helpconfig.py
    M testing/test_junitxml.py
    M testing/test_mark.py
    M testing/test_modimport.py
    M testing/test_monkeypatch.py
    M testing/test_nodes.py
    M testing/test_nose.py
    M testing/test_parseopt.py
    M testing/test_pastebin.py
    M testing/test_pdb.py
    M testing/test_pluginmanager.py
    M testing/test_pytester.py
    M testing/test_recwarn.py
    M testing/test_resultlog.py
    M testing/test_runner.py
    M testing/test_runner_xunit.py
    M testing/test_session.py
    M testing/test_skipping.py
    M testing/test_terminal.py
    M testing/test_tmpdir.py
    M testing/test_unittest.py
    M testing/test_warnings.py
    M tox.ini

  Log Message:
  -----------
  Merge pull request #3485 from RonnyPfannschmidt/pre-commit-hook

adapt Pre commit hook and black


Compare: https://github.com/pytest-dev/pytest/compare/b4cd010d71b2...a36bab448f4b
      **NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.


More information about the pytest-commit mailing list