From nicoddemus at gmail.com  Sun Oct  1 13:32:37 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Sun, 01 Oct 2017 10:32:37 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 7093d8: Add example of -k 'not
 test' in help text
Message-ID: <59d126b530531_a1c3fe7d60e3c3055788@hookshot-fe1-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  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


Compare: https://github.com/pytest-dev/pytest/compare/966391c77e8f...6690b8a44420

From nicoddemus at gmail.com  Wed Oct  4 16:27:03 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 04 Oct 2017 13:27:03 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 6b91bc: Preparing release
 version 3.2.3
Message-ID: <59d54417af1ff_34523fe3b8db5c3c5753c@hookshot-fe2-cp1-prd.iad.github.net.mail>

  Branch: refs/tags/3.2.3
  Home:   https://github.com/pytest-dev/pytest
  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



From nicoddemus at gmail.com  Wed Oct  4 16:27:37 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 04 Oct 2017 13:27:37 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 6b91bc: Preparing release
 version 3.2.3
Message-ID: <59d54439e632a_44fd3f7e0a371c30326b9@hookshot-fe2-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  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


Compare: https://github.com/pytest-dev/pytest/compare/6690b8a44420...9ee0a1f5c311

From nicoddemus at gmail.com  Wed Oct  4 17:36:19 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 04 Oct 2017 14:36:19 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 280213: fix 'DoctestItem'
 object has no attribute '_fixtur...
Message-ID: <59d554532d33a_daf3feeb97efc381112f8@hookshot-fe3-cp1-prd.iad.github.net.mail>

  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

From nicoddemus at gmail.com  Mon Oct  9 11:17:16 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 09 Oct 2017 08:17:16 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 667e70: switch out the
 placeholder MarkEvaluator in unitte...
Message-ID: <59db92fcdafa7_25c03feb25627c4479341@hookshot-fe2-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 667e70f5551da23b86dd6ee29b5f77d5c604d003
      https://github.com/pytest-dev/pytest/commit/667e70f5551da23b86dd6ee29b5f77d5c604d003
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-10-06 (Fri, 06 Oct 2017)

  Changed paths:
    M _pytest/unittest.py
    A changelog/2767.trivial

  Log Message:
  -----------
  switch out the placeholder MarkEvaluator in unittest plugin


  Commit: a33650953a4838cd742f547ea14dcd8fc7731adb
      https://github.com/pytest-dev/pytest/commit/a33650953a4838cd742f547ea14dcd8fc7731adb
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-10-06 (Fri, 06 Oct 2017)

  Changed paths:
    M _pytest/unittest.py

  Log Message:
  -----------
  remove unused import


  Commit: 9ad2b75038204ab44125219797df3b9dabb99889
      https://github.com/pytest-dev/pytest/commit/9ad2b75038204ab44125219797df3b9dabb99889
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-10-06 (Fri, 06 Oct 2017)

  Changed paths:
    M _pytest/skipping.py
    M _pytest/unittest.py
    A changelog/2767.removal

  Log Message:
  -----------
  skipping: replace _evalskip with a more consistent _skipped_by_mark


  Commit: 8480075f01af2f35e97ad99bb6eeb39b90b0a24a
      https://github.com/pytest-dev/pytest/commit/8480075f01af2f35e97ad99bb6eeb39b90b0a24a
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-10-06 (Fri, 06 Oct 2017)

  Changed paths:
    M _pytest/skipping.py

  Log Message:
  -----------
  resuffle markevaluator internal structure


  Commit: e3b73682b229fc52db2124981bd6f21ad1c2dc9d
      https://github.com/pytest-dev/pytest/commit/e3b73682b229fc52db2124981bd6f21ad1c2dc9d
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-10-06 (Fri, 06 Oct 2017)

  Changed paths:
    M _pytest/skipping.py

  Log Message:
  -----------
  flake8 fix


  Commit: 459cc401929db9f6c8b9970a015ab251b221ffec
      https://github.com/pytest-dev/pytest/commit/459cc401929db9f6c8b9970a015ab251b221ffec
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-10-06 (Fri, 06 Oct 2017)

  Changed paths:
    M _pytest/skipping.py

  Log Message:
  -----------
  skipping: cleanup

remove dead comments
fix naming
remove dead code


  Commit: 8a6bdb282f2ddaa72f5010e5fbe88726b4b8d022
      https://github.com/pytest-dev/pytest/commit/8a6bdb282f2ddaa72f5010e5fbe88726b4b8d022
  Author: Ronny Pfannschmidt <opensource at ronnypfannschmidt.de>
  Date:   2017-10-09 (Mon, 09 Oct 2017)

  Changed paths:
    M changelog/2767.removal

  Log Message:
  -----------
  fix changelog entry


  Commit: 059455b45d7f36c4a000d63c00be91b19523c1d9
      https://github.com/pytest-dev/pytest/commit/059455b45d7f36c4a000d63c00be91b19523c1d9
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-10-09 (Mon, 09 Oct 2017)

  Changed paths:
    M _pytest/skipping.py
    M _pytest/unittest.py
    A changelog/2767.removal
    A changelog/2767.trivial

  Log Message:
  -----------
  Merge pull request #2773 from RonnyPfannschmidt/fix-markeval-2767

refactor mark evaluators


Compare: https://github.com/pytest-dev/pytest/compare/9b0ce535c942...059455b45d7f

From nicoddemus at gmail.com  Mon Oct 16 19:18:20 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 16 Oct 2017 16:18:20 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] a4fd5c: Fix auto-use fixture doc
Message-ID: <59e53e3c5042f_a5e23fa002be3c28133951@hookshot-fe-6dbb0c4.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: a4fd5cdcb53e49f8c482386612cd7b2efc1e3c44
      https://github.com/pytest-dev/pytest/commit/a4fd5cdcb53e49f8c482386612cd7b2efc1e3c44
  Author: Pierre GIRAUD <pierre.giraud at gmail.com>
  Date:   2017-10-16 (Mon, 16 Oct 2017)

  Changed paths:
    M doc/en/fixture.rst

  Log Message:
  -----------
  Fix auto-use fixture doc


  Commit: 3676da594c76243cbb2271a59213d3b2ded2f729
      https://github.com/pytest-dev/pytest/commit/3676da594c76243cbb2271a59213d3b2ded2f729
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-10-16 (Mon, 16 Oct 2017)

  Changed paths:
    M doc/en/fixture.rst

  Log Message:
  -----------
  Merge pull request #2841 from pgiraud/patch-1

Fix auto-use fixture doc


Compare: https://github.com/pytest-dev/pytest/compare/ae4e596b31fd...3676da594c76

From nicoddemus at gmail.com  Wed Oct 18 16:35:14 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 18 Oct 2017 13:35:14 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 66e9a7: get PYTEST_ADDOPTS
 before calling _initini
Message-ID: <59e7bb0282df3_4ad3fd6b80bfc241542ea@hookshot-fe-92cdb05.cp1-iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 66e9a794726fd4ba6dc7e28962cdb46b46297e9b
      https://github.com/pytest-dev/pytest/commit/66e9a794726fd4ba6dc7e28962cdb46b46297e9b
  Author: Dirk Thomas <dirk-thomas at users.noreply.github.com>
  Date:   2017-10-11 (Wed, 11 Oct 2017)

  Changed paths:
    M _pytest/config.py

  Log Message:
  -----------
  get PYTEST_ADDOPTS before calling _initini


  Commit: ed7aa074aa6b17befed57264a2414e633f792109
      https://github.com/pytest-dev/pytest/commit/ed7aa074aa6b17befed57264a2414e633f792109
  Author: Dirk Thomas <dirk-thomas at users.noreply.github.com>
  Date:   2017-10-11 (Wed, 11 Oct 2017)

  Changed paths:
    A changelog/2824.feature

  Log Message:
  -----------
  add changelog file for #2824


  Commit: ce8c829945ef30352cc7bec750b91eda85eba8f9
      https://github.com/pytest-dev/pytest/commit/ce8c829945ef30352cc7bec750b91eda85eba8f9
  Author: Dirk Thomas <dirk-thomas at users.noreply.github.com>
  Date:   2017-10-11 (Wed, 11 Oct 2017)

  Changed paths:
    M testing/test_config.py

  Log Message:
  -----------
  add test for #2824


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

  Changed paths:
    M testing/test_config.py

  Log Message:
  -----------
  Use a relative cache_dir in test because of how arguments are parsed on Windows

We use shlex to parse command-line arguments and PYTEST_ADDOPTS, so passing
a full path with '\' arguments produces incorrect results on Windows

Anyway users are advised to use relative paths for portability


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

  Changed paths:
    M _pytest/config.py
    A changelog/2824.feature
    M testing/test_config.py

  Log Message:
  -----------
  Merge pull request #2824 from dirk-thomas/pytest_addopts_before_initini

get PYTEST_ADDOPTS before calling _initini


Compare: https://github.com/pytest-dev/pytest/compare/71c76d96d3f5...537fc3c31525

From nicoddemus at gmail.com  Wed Oct 18 17:18:58 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 18 Oct 2017 14:18:58 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] baadd5: Clarify the
 documentation of fixture scopes. Close...
Message-ID: <59e7c5429e70b_75673fd61f2e7c347922a@hookshot-fe1-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: baadd569e8e1be13fc0d7b0c55273520f5367463
      https://github.com/pytest-dev/pytest/commit/baadd569e8e1be13fc0d7b0c55273520f5367463
  Author: Christoph Buchner <bilderbuchi at phononoia.at>
  Date:   2017-10-17 (Tue, 17 Oct 2017)

  Changed paths:
    A changelog/538.doc
    M doc/en/fixture.rst

  Log Message:
  -----------
  Clarify the documentation of fixture scopes. Closes #538.


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

  Changed paths:
    A changelog/538.doc
    M doc/en/fixture.rst

  Log Message:
  -----------
  Merge pull request #2848 from bilderbuchi/fix-538

Clarify the documentation of fixture scopes


Compare: https://github.com/pytest-dev/pytest/compare/2d0800503982...8c7974af016c

From nicoddemus at gmail.com  Wed Oct 18 17:44:53 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 18 Oct 2017 14:44:53 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 46cc9a: Add documentation about
 python -m pytest invocatio...
Message-ID: <59e7cb5565c0d_7ca03fa5e401bc3c657f5@hookshot-fe3-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 46cc9ab77c5e04fbb6c8b06688b8a41b686d3c97
      https://github.com/pytest-dev/pytest/commit/46cc9ab77c5e04fbb6c8b06688b8a41b686d3c97
  Author: Christoph Buchner <bilderbuchi at phononoia.at>
  Date:   2017-10-18 (Wed, 18 Oct 2017)

  Changed paths:
    A changelog/911.doc
    M doc/en/pythonpath.rst
    M doc/en/usage.rst

  Log Message:
  -----------
  Add documentation about python -m pytest invocation.


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

  Changed paths:
    A changelog/911.doc
    M doc/en/pythonpath.rst
    M doc/en/usage.rst

  Log Message:
  -----------
  Merge pull request #2850 from bilderbuchi/docs-911

Add documentation about python -m pytest invocation.


Compare: https://github.com/pytest-dev/pytest/compare/8c7974af016c...4cb60dac3d7f

From nicoddemus at gmail.com  Thu Oct 19 18:48:24 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 19 Oct 2017 15:48:24 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 5c7115: Add more text to the
 2.6 and 3.3 announcement
Message-ID: <59e92bb8f3c38_1f6c3fc437bfbc34113246@hookshot-fe6-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 5c71151967797b5b4886b7021edabdf17ee6e566
      https://github.com/pytest-dev/pytest/commit/5c71151967797b5b4886b7021edabdf17ee6e566
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-10-19 (Thu, 19 Oct 2017)

  Changed paths:
    M changelog/2812.removal

  Log Message:
  -----------
  Add more text to the 2.6 and 3.3 announcement

The text was a bit short for this important announcement.



From nicoddemus at gmail.com  Mon Oct 23 16:35:27 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Mon, 23 Oct 2017 13:35:27 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 3cdbb1: #2692: Document
 setup/teardown behaviour when usin...
Message-ID: <59ee528f18a6a_24a33feaa0057c2c517c5@hookshot-fe6-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 3cdbb1854f802bc3250ebcf3014fc1241389c48c
      https://github.com/pytest-dev/pytest/commit/3cdbb1854f802bc3250ebcf3014fc1241389c48c
  Author: Owen Tuz <owentuz at gmail.com>
  Date:   2017-10-21 (Sat, 21 Oct 2017)

  Changed paths:
    M doc/en/unittest.rst

  Log Message:
  -----------
  #2692: Document setup/teardown behaviour when using unittest-based suites


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

  Changed paths:
    M doc/en/unittest.rst

  Log Message:
  -----------
  Merge pull request #2859 from OwenTuz/issue-2692-document-setup-teardown-mismatch-in-unittest-integration

2692.docs document setup/teardown behaviour when using unittest-based su?


Compare: https://github.com/pytest-dev/pytest/compare/531e0dcaa342...b61cbc4fbaa0

From nicoddemus at gmail.com  Tue Oct 24 18:11:22 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 24 Oct 2017 15:11:22 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 52aadc: Strip whitespace from
 markers in INI config
Message-ID: <59efba8a2e152_cd23fa9cf63bc406218f@hookshot-fe6-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 52aadcd7c126f05a7219db88ac8d3d233b3de5c3
      https://github.com/pytest-dev/pytest/commit/52aadcd7c126f05a7219db88ac8d3d233b3de5c3
  Author: Sviatoslav Abakumov <abakumov.sviatoslav at progforce.com>
  Date:   2017-10-24 (Tue, 24 Oct 2017)

  Changed paths:
    M _pytest/mark.py
    A changelog/2856.bugfix
    M testing/test_mark.py

  Log Message:
  -----------
  Strip whitespace from markers in INI config

Resolves #2856.


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

  Changed paths:
    M _pytest/mark.py
    A changelog/2856.bugfix
    M testing/test_mark.py

  Log Message:
  -----------
  Merge pull request #2867 from Perlence/ini-markers-whitespace

Strip whitespace from markers in INI config


Compare: https://github.com/pytest-dev/pytest/compare/5631a8629696...bdab29fa3df5

From nicoddemus at gmail.com  Tue Oct 24 18:12:47 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 24 Oct 2017 15:12:47 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] e23af0: Introduce a dedicated
 section about conftest.py
Message-ID: <59efbadfed47f_6033f99ae4abc3010580@hookshot-fe-92cdb05.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: e23af009f9b3a03002296e760e8f067fc84b840e
      https://github.com/pytest-dev/pytest/commit/e23af009f9b3a03002296e760e8f067fc84b840e
  Author: Christoph Buchner <bilderbuchi at phononoia.at>
  Date:   2017-10-23 (Mon, 23 Oct 2017)

  Changed paths:
    A changelog/1505.doc
    M doc/en/assert.rst
    M doc/en/fixture.rst
    M doc/en/plugins.rst
    M doc/en/writing_plugins.rst

  Log Message:
  -----------
  Introduce a dedicated section about conftest.py

Also reorganize conftest-related content a bit.
Closes #1505, closes #1770.


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

  Changed paths:
    A changelog/1505.doc
    M doc/en/assert.rst
    M doc/en/fixture.rst
    M doc/en/plugins.rst
    M doc/en/writing_plugins.rst

  Log Message:
  -----------
  Merge pull request #2864 from bilderbuchi/fix-1505

Introduce a dedicated section about conftest.py


Compare: https://github.com/pytest-dev/pytest/compare/bdab29fa3df5...0b540f98b1ac

From nicoddemus at gmail.com  Thu Oct 26 18:15:23 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 26 Oct 2017 15:15:23 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 3427d2: Try to get docstring
 from module node
Message-ID: <59f25e7bd7dae_3be3feb6246fc344771c@hookshot-fe6-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 3427d27d5a517a265502feba359df4f7c46ed611
      https://github.com/pytest-dev/pytest/commit/3427d27d5a517a265502feba359df4f7c46ed611
  Author: Sviatoslav Abakumov <abakumov.sviatoslav at progforce.com>
  Date:   2017-10-25 (Wed, 25 Oct 2017)

  Changed paths:
    M _pytest/assertion/rewrite.py
    M testing/test_assertrewrite.py

  Log Message:
  -----------
  Try to get docstring from module node


  Commit: fd7bfa30d0a6d2415f5669bdbe035dba1fcad5b2
      https://github.com/pytest-dev/pytest/commit/fd7bfa30d0a6d2415f5669bdbe035dba1fcad5b2
  Author: Sviatoslav Abakumov <abakumov.sviatoslav at progforce.com>
  Date:   2017-10-25 (Wed, 25 Oct 2017)

  Changed paths:
    M _pytest/assertion/rewrite.py
    M testing/test_assertrewrite.py

  Log Message:
  -----------
  Put imports on the last line unless there are other exprs


  Commit: 27bb2eceb43f9c2c3747cf3c0a2e999292d382fc
      https://github.com/pytest-dev/pytest/commit/27bb2eceb43f9c2c3747cf3c0a2e999292d382fc
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-10-26 (Thu, 26 Oct 2017)

  Changed paths:
    M testing/test_assertrewrite.py

  Log Message:
  -----------
  Add comment about why we remove docstrings on test_assertrewrite

As explained in pytest-dev/pytest#2870


  Commit: 734c435d006d589d475a418b2e26b524dcf3c986
      https://github.com/pytest-dev/pytest/commit/734c435d006d589d475a418b2e26b524dcf3c986
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-10-26 (Thu, 26 Oct 2017)

  Changed paths:
    M _pytest/assertion/rewrite.py
    M testing/test_assertrewrite.py

  Log Message:
  -----------
  Merge pull request #2870 from Perlence/rewrite-python-37-docstring

Adapt the Python 3.7 AST changes


Compare: https://github.com/pytest-dev/pytest/compare/0b540f98b1ac...734c435d006d

From nicoddemus at gmail.com  Thu Oct 26 18:21:32 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 26 Oct 2017 15:21:32 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 383239: doc: Include collector
 config in the skip doc
Message-ID: <59f25fece6f8e_293fa3fb46578dc2496973@hookshot-fe-6dbb0c4.cp1-iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 383239cafccabec6b03d1a46d69da4c2376e4445
      https://github.com/pytest-dev/pytest/commit/383239cafccabec6b03d1a46d69da4c2376e4445
  Author: Stephen Finucane <stephen at that.guru>
  Date:   2017-10-26 (Thu, 26 Oct 2017)

  Changed paths:
    M doc/en/example/pythoncollection.rst
    M doc/en/skipping.rst

  Log Message:
  -----------
  doc: Include collector config in the skip doc

None of the decorators are sufficient to skip an entire file, for
example if the file contain invalid code for a given Python version.
Simply link to details about customizing the collector.

Signed-off-by: Stephen Finucane <stephen at that.guru>


  Commit: 111d640bdb69a0bba25f86e5c265ab02415698c3
      https://github.com/pytest-dev/pytest/commit/111d640bdb69a0bba25f86e5c265ab02415698c3
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-10-26 (Thu, 26 Oct 2017)

  Changed paths:
    M doc/en/example/pythoncollection.rst
    M doc/en/skipping.rst

  Log Message:
  -----------
  Merge pull request #2873 from stephenfin/doc/skipping-entire-files

doc: Include collector config in the skip doc


Compare: https://github.com/pytest-dev/pytest/compare/734c435d006d...111d640bdb69