[Pytest-commit] [pytest-dev/pytest] 547070: Switch `for_parameterize` to `for_parametrize`

[Bruno Oliveira]

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 547070e2d83617988ce07f2de6240f3ba3705d9c
      https://github.com/pytest-dev/pytest/commit/547070e2d83617988ce07f2de6240f3ba3705d9c
  Author: Alan Velasco <AlanVelasco.A at gmail.com>
  Date:   2018-01-30 (Tue, 30 Jan 2018)

  Changed paths:
    M _pytest/mark.py
    M _pytest/python.py
    A changelog/3166.trivial

  Log Message:
  -----------
  Switch `for_parameterize` to `for_parametrize`


  Commit: e12a588c394d2f96e89b6e348133589d72e2bf2e
      https://github.com/pytest-dev/pytest/commit/e12a588c394d2f96e89b6e348133589d72e2bf2e
  Author: Alan Velasco <AlanVelasco.A at gmail.com>
  Date:   2018-01-30 (Tue, 30 Jan 2018)

  Changed paths:
    M .gitignore
    M AUTHORS
    M CHANGELOG.rst
    M HOWTORELEASE.rst
    M _pytest/_argcomplete.py
    M _pytest/assertion/__init__.py
    M _pytest/cacheprovider.py
    M _pytest/capture.py
    M _pytest/config.py
    M _pytest/debugging.py
    M _pytest/fixtures.py
    M _pytest/helpconfig.py
    M _pytest/hookspec.py
    M _pytest/junitxml.py
    M _pytest/logging.py
    M _pytest/main.py
    M _pytest/mark.py
    M _pytest/monkeypatch.py
    M _pytest/nodes.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/runner.py
    M _pytest/terminal.py
    M _pytest/tmpdir.py
    R changelog/2022.bugfix
    R changelog/2423.doc
    R changelog/2457.doc
    R changelog/2698.doc
    R changelog/3067.trivial
    R changelog/3074.bugfix
    R changelog/3076.doc
    R changelog/3092.doc
    R changelog/3129.trivial
    R changelog/3131.doc
    R changelog/3143.doc
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.4.0.rst
    M doc/en/builtin.rst
    M doc/en/cache.rst
    M doc/en/customize.rst
    M doc/en/example/assertion/failure_demo.py
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/example/special.rst
    M doc/en/fixture.rst
    M doc/en/logging.rst
    M doc/en/usage.rst
    M doc/en/writing_plugins.rst
    M pytest.py
    M tasks/requirements.txt
    M testing/acceptance_test.py
    M testing/deprecated_test.py
    M testing/logging/test_fixture.py
    A testing/logging/test_formatter.py
    M testing/logging/test_reporting.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/metafunc.py
    R testing/test_cache.py
    A testing/test_cacheprovider.py
    M testing/test_capture.py
    M testing/test_config.py
    M testing/test_junitxml.py
    M testing/test_mark.py
    M testing/test_pytester.py
    M testing/test_resultlog.py
    M testing/test_runner.py
    M testing/test_terminal.py
    M tox.ini

  Log Message:
  -----------
  Merge branch 'master' into typo_for_parametrize


  Commit: ef7df8f167cdcf774bd3688f4df98ee10b80766d
      https://github.com/pytest-dev/pytest/commit/ef7df8f167cdcf774bd3688f4df98ee10b80766d
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-01-30 (Tue, 30 Jan 2018)

  Changed paths:
    M changelog/3166.trivial

  Log Message:
  -----------
  Small update to CHANGELOG


  Commit: 89a55d85a9d30ef2a2394b3969fc7067f1c15b59
      https://github.com/pytest-dev/pytest/commit/89a55d85a9d30ef2a2394b3969fc7067f1c15b59
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-01-30 (Tue, 30 Jan 2018)

  Changed paths:
    M _pytest/mark.py
    M _pytest/python.py
    A changelog/3166.trivial

  Log Message:
  -----------
  Merge pull request #3166 from alanbato/typo_for_parametrize

Switch `for_parameterize` to `for_parametrize`


Compare: https://github.com/pytest-dev/pytest/compare/f2fb841b2982...89a55d85a9d3