[Pytest-commit] [pytest-dev/pytest] 4c148b: Fix imports in failure_demo.py

[Bruno Oliveira]

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 4c148bd0ef8a0cc9d15d7aaf6d3cce044d99bfa3
      https://github.com/pytest-dev/pytest/commit/4c148bd0ef8a0cc9d15d7aaf6d3cce044d99bfa3
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-01-30 (Tue, 30 Jan 2018)

  Changed paths:
    M doc/en/example/assertion/failure_demo.py

  Log Message:
  -----------
  Fix imports in failure_demo.py


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

  Changed paths:
    M HOWTORELEASE.rst

  Log Message:
  -----------
  Suggest to update all dependencies when preparing releases


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

  Changed paths:
    M CHANGELOG.rst
    R changelog/2022.bugfix
    R changelog/2147.removal
    R changelog/2423.doc
    R changelog/2457.doc
    R changelog/2527.feature
    R changelog/2698.doc
    R changelog/2953.trivial
    R changelog/2976.trivial
    R changelog/3013.feature
    R changelog/3016.bugfix
    R changelog/3038.feature
    R changelog/3067.trivial
    R changelog/3074.bugfix
    R changelog/3076.doc
    R changelog/3088.bugfix
    R changelog/3092.doc
    R changelog/3101.feature
    R changelog/3103.bugfix
    R changelog/3107.feature
    R changelog/3117.feature
    R changelog/3129.trivial
    R changelog/3130.feature
    R changelog/3131.doc
    R changelog/3138.feature
    R changelog/3142.feature
    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/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/usage.rst

  Log Message:
  -----------
  Preparing release version 3.4.0


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

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Changelog adjustments suggested during review


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

  Changed paths:
    M CHANGELOG.rst
    M HOWTORELEASE.rst
    R changelog/2022.bugfix
    R changelog/2147.removal
    R changelog/2423.doc
    R changelog/2457.doc
    R changelog/2527.feature
    R changelog/2698.doc
    R changelog/2953.trivial
    R changelog/2976.trivial
    R changelog/3013.feature
    R changelog/3016.bugfix
    R changelog/3038.feature
    R changelog/3067.trivial
    R changelog/3074.bugfix
    R changelog/3076.doc
    R changelog/3088.bugfix
    R changelog/3092.doc
    R changelog/3101.feature
    R changelog/3103.bugfix
    R changelog/3107.feature
    R changelog/3117.feature
    R changelog/3129.trivial
    R changelog/3130.feature
    R changelog/3131.doc
    R changelog/3138.feature
    R changelog/3142.feature
    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/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/usage.rst

  Log Message:
  -----------
  Merge pull request #3162 from nicoddemus/release-3.4.0

Release 3.4.0


Compare: https://github.com/pytest-dev/pytest/compare/71a7b3c062d5...dc9a9ec4c29d