[Pytest-commit] [pytest-dev/pytest] 280213: fix 'DoctestItem' object has no attribute '_fixtur...

[Bruno Oliveira]

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 2802135741a69fac1a22fa29832cd9b5605d87d1
      https://github.com/pytest-dev/pytest/commit/2802135741a69fac1a22fa29832cd9b5605d87d1
  Author: Oliver Bestwalter <oliver.bestwalter at avira.com>
  Date:   2017-09-19 (Tue, 19 Sep 2017)

  Changed paths:
    M _pytest/python.py
    A changelog/2788.bugfix
    M testing/python/show_fixtures_per_test.py

  Log Message:
  -----------
  fix 'DoctestItem' object has no attribute '_fixtureinfo'

* doxtests don't seem to have this attribute, so nothing will be written in that case.
* tried to be a good boy scout and tidied up surrounding code a bit (comments, shadowed/unused names, removed random new lines, naming things)


  Commit: 58aaabbb10c7c044ed09b7756c1b5501556f9524
      https://github.com/pytest-dev/pytest/commit/58aaabbb10c7c044ed09b7756c1b5501556f9524
  Author: Oliver Bestwalter <oliver.bestwalter at avira.com>
  Date:   2017-09-19 (Tue, 19 Sep 2017)

  Changed paths:
    M CONTRIBUTING.rst

  Log Message:
  -----------
  fix tox documentation link


  Commit: 9c8847a0cb7d2f2a5fcf4a489255dd6cfa11497b
      https://github.com/pytest-dev/pytest/commit/9c8847a0cb7d2f2a5fcf4a489255dd6cfa11497b
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-09-19 (Tue, 19 Sep 2017)

  Changed paths:
    M CONTRIBUTING.rst

  Log Message:
  -----------
  Merge pull request #2792 from Avira/fix-tox-docs-link

fix tox documentation link


  Commit: 966391c77e8f5c528487b7165af908df4c09ce1d
      https://github.com/pytest-dev/pytest/commit/966391c77e8f5c528487b7165af908df4c09ce1d
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-09-19 (Tue, 19 Sep 2017)

  Changed paths:
    M _pytest/python.py
    A changelog/2788.bugfix
    M testing/python/show_fixtures_per_test.py

  Log Message:
  -----------
  Merge pull request #2789 from Avira/master

Don't crash if an item has no _fixtureinfo attribute


  Commit: 7093d8f65e48a0c944d1688f9d80d7e8f51b6b8b
      https://github.com/pytest-dev/pytest/commit/7093d8f65e48a0c944d1688f9d80d7e8f51b6b8b
  Author: Xuan Luong <luonghoaixuan at gmail.com>
  Date:   2017-09-30 (Sat, 30 Sep 2017)

  Changed paths:
    M _pytest/mark.py
    A changelog/1442.doc

  Log Message:
  -----------
  Add example of -k 'not test' in help text


  Commit: 6690b8a44420aba860e6f2c79ca296e61e249f3c
      https://github.com/pytest-dev/pytest/commit/6690b8a44420aba860e6f2c79ca296e61e249f3c
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-10-01 (Sun, 01 Oct 2017)

  Changed paths:
    M _pytest/mark.py
    A changelog/1442.doc

  Log Message:
  -----------
  Merge pull request #2807 from xuanluong/issue-1442-mention-not--k-help

[doc] Add example of -k 'not test' in help text


  Commit: 6b91bc88de36e3c75da5ab1b7480cbe067eed57b
      https://github.com/pytest-dev/pytest/commit/6b91bc88de36e3c75da5ab1b7480cbe067eed57b
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-10-03 (Tue, 03 Oct 2017)

  Changed paths:
    M CHANGELOG.rst
    R changelog/1442.doc
    R changelog/1548.doc
    R changelog/2722.trivial
    R changelog/2748.bugfix
    R changelog/2758.bugfix
    R changelog/2765.trivial
    R changelog/2788.bugfix
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.2.3.rst
    M doc/en/parametrize.rst
    M doc/en/skipping.rst

  Log Message:
  -----------
  Preparing release version 3.2.3


  Commit: 9ee0a1f5c31102be63219812353536761e6b1aca
      https://github.com/pytest-dev/pytest/commit/9ee0a1f5c31102be63219812353536761e6b1aca
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-10-04 (Wed, 04 Oct 2017)

  Changed paths:
    M CHANGELOG.rst
    R changelog/1442.doc
    R changelog/1548.doc
    R changelog/2722.trivial
    R changelog/2748.bugfix
    R changelog/2758.bugfix
    R changelog/2765.trivial
    R changelog/2788.bugfix
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.2.3.rst
    M doc/en/parametrize.rst
    M doc/en/skipping.rst

  Log Message:
  -----------
  Merge pull request #2813 from nicoddemus/release-3.2.3

Preparing release version 3.2.3


  Commit: e7a4d3d8cf5cee96d2ce06f8e87268bac39a7287
      https://github.com/pytest-dev/pytest/commit/e7a4d3d8cf5cee96d2ce06f8e87268bac39a7287
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-10-04 (Wed, 04 Oct 2017)

  Changed paths:
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M _pytest/mark.py
    M _pytest/python.py
    R changelog/1548.doc
    R changelog/2722.trivial
    R changelog/2748.bugfix
    R changelog/2758.bugfix
    R changelog/2765.trivial
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.2.3.rst
    M doc/en/parametrize.rst
    M doc/en/skipping.rst
    M testing/python/show_fixtures_per_test.py

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master' into features


Compare: https://github.com/pytest-dev/pytest/compare/61eb20df7139...e7a4d3d8cf5c