[Pytest-commit] [pytest-dev/pytest] 07dd1c: Preparing release version 3.2.0

[Bruno Oliveira]

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 07dd1ca7b88f2e1076376270b5cfc4f528de44b3
      https://github.com/pytest-dev/pytest/commit/07dd1ca7b88f2e1076376270b5cfc4f528de44b3
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-07-30 (Sun, 30 Jul 2017)

  Changed paths:
    M CHANGELOG.rst
    R changelog/1994.feature
    R changelog/2003.removal
    R changelog/2023.bugfix
    R changelog/2147.removal
    R changelog/2375.bugfix
    R changelog/2427.removal
    R changelog/2444.trivial
    R changelog/2489.trivial
    R changelog/2510.bugfix
    R changelog/2516.feature
    R changelog/2518.feature
    R changelog/2528.feature
    R changelog/2533.trivial
    R changelog/2539.doc
    R changelog/2540.feature
    R changelog/2543.feature
    R changelog/2546.trivial
    R changelog/2548.bugfix
    R changelog/2555.bugfix
    R changelog/2562.trivial
    R changelog/2571.trivial
    R changelog/2574.bugfix
    R changelog/2581.trivial
    R changelog/2582.trivial
    R changelog/2583.feature
    R changelog/2588.trivial
    R changelog/2598.feature
    R changelog/2610.bugfix
    R changelog/2620.trivial
    R changelog/2621.feature
    R changelog/2622.feature
    R changelog/2631.feature
    R changelog/580.feature
    R changelog/920.bugfix
    R changelog/971.doc
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.2.0.rst
    M doc/en/builtin.rst
    M doc/en/cache.rst
    M doc/en/example/markers.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/parametrize.rst

  Log Message:
  -----------
  Preparing release version 3.2.0


  Commit: d2bca93109a7c85f316e493c5c31ee2322578980
      https://github.com/pytest-dev/pytest/commit/d2bca93109a7c85f316e493c5c31ee2322578980
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-08-01 (Tue, 01 Aug 2017)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Update grammar in changelog as requested


  Commit: 51ebad76f2b996bf578b9bd89cf1c8eddaf98f42
      https://github.com/pytest-dev/pytest/commit/51ebad76f2b996bf578b9bd89cf1c8eddaf98f42
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-08-01 (Tue, 01 Aug 2017)

  Changed paths:
    M HOWTORELEASE.rst

  Log Message:
  -----------
  Fix merge instruction after a minor/major release


  Commit: 0a15edd5732578f6cc40e28770f0fc87dfa5ced9
      https://github.com/pytest-dev/pytest/commit/0a15edd5732578f6cc40e28770f0fc87dfa5ced9
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-08-01 (Tue, 01 Aug 2017)

  Changed paths:
    M .travis.yml
    M AUTHORS
    M CHANGELOG.rst
    M _pytest/_code/code.py
    M _pytest/cacheprovider.py
    M _pytest/compat.py
    M _pytest/deprecated.py
    M _pytest/fixtures.py
    M _pytest/hookspec.py
    M _pytest/main.py
    M _pytest/mark.py
    A _pytest/outcomes.py
    M _pytest/python.py
    A _pytest/python_api.py
    M _pytest/recwarn.py
    M _pytest/runner.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    M _pytest/unittest.py
    M _pytest/warnings.py
    M appveyor.yml
    R changelog/2023.bugfix
    R changelog/2375.bugfix
    R changelog/2444.trivial
    R changelog/2510.bugfix
    R changelog/2533.trivial
    R changelog/2539.doc
    R changelog/2546.trivial
    R changelog/2548.bugfix
    R changelog/2555.bugfix
    R changelog/2562.trivial
    R changelog/2571.trivial
    R changelog/2574.bugfix
    R changelog/2581.trivial
    R changelog/2582.trivial
    R changelog/2610.bugfix
    R changelog/2620.trivial
    R changelog/971.doc
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.2.0.rst
    M doc/en/builtin.rst
    M doc/en/cache.rst
    M doc/en/customize.rst
    M doc/en/example/markers.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/getting-started.rst
    M doc/en/parametrize.rst
    M doc/en/usage.rst
    M doc/en/warnings.rst
    M doc/en/writing_plugins.rst
    M pytest.py
    M setup.py
    M testing/code/test_excinfo.py
    M testing/python/approx.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/metafunc.py
    M testing/python/setup_only.py
    M testing/test_cache.py
    M testing/test_collection.py
    M testing/test_mark.py
    M testing/test_recwarn.py
    M testing/test_runner.py
    M testing/test_terminal.py
    M testing/test_unittest.py
    M testing/test_warnings.py
    M tox.ini

  Log Message:
  -----------
  Merge branch 'release-3.2.0'


  Commit: 40254b64e567d2fc82d9168723fdadced3674246
      https://github.com/pytest-dev/pytest/commit/40254b64e567d2fc82d9168723fdadced3674246
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-08-01 (Tue, 01 Aug 2017)

  Changed paths:
    M CHANGELOG.rst
    M HOWTORELEASE.rst
    R changelog/1994.feature
    R changelog/2003.removal
    R changelog/2023.bugfix
    R changelog/2147.removal
    R changelog/2375.bugfix
    R changelog/2427.removal
    R changelog/2444.trivial
    R changelog/2489.trivial
    R changelog/2510.bugfix
    R changelog/2516.feature
    R changelog/2518.feature
    R changelog/2528.feature
    R changelog/2533.trivial
    R changelog/2539.doc
    R changelog/2540.feature
    R changelog/2543.feature
    R changelog/2546.trivial
    R changelog/2548.bugfix
    R changelog/2555.bugfix
    R changelog/2562.trivial
    R changelog/2571.trivial
    R changelog/2574.bugfix
    R changelog/2581.trivial
    R changelog/2582.trivial
    R changelog/2583.feature
    R changelog/2588.trivial
    R changelog/2598.feature
    R changelog/2610.bugfix
    R changelog/2620.trivial
    R changelog/2621.feature
    R changelog/2622.feature
    R changelog/2631.feature
    R changelog/580.feature
    R changelog/920.bugfix
    R changelog/971.doc
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.2.0.rst
    M doc/en/builtin.rst
    M doc/en/cache.rst
    M doc/en/example/markers.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/parametrize.rst

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


Compare: https://github.com/pytest-dev/pytest/compare/6e7547244bc2...40254b64e567