Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 2b1410895e9ac30c4f08e9a701017cce65a9717b
      
https://github.com/pytest-dev/pytest/commit/2b1410895e9ac30c4f08e9a701017cce65a9717b
  Author: turturica <Ionut Turturica>
  Date:   2018-04-11 (Wed, 11 Apr 2018)

  Changed paths:
    M AUTHORS
    M _pytest/fixtures.py
    M _pytest/main.py
    M _pytest/python.py
    A changelog/2283.feature
    M testing/python/fixture.py
    M testing/test_collection.py
    M testing/test_session.py

  Log Message:
  -----------
  Add package scoped fixtures #2283


  Commit: 35df2cdbee3e626abbecfc14e394f4c8b6e252f3
      
https://github.com/pytest-dev/pytest/commit/35df2cdbee3e626abbecfc14e394f4c8b6e252f3
  Author: turturica <Ionut Turturica>
  Date:   2018-04-11 (Wed, 11 Apr 2018)

  Changed paths:
    M _pytest/python.py

  Log Message:
  -----------
  Fix linting error.


  Commit: c02e8d8b0d4a50cb802b901f78412448612d03ed
      
https://github.com/pytest-dev/pytest/commit/c02e8d8b0d4a50cb802b901f78412448612d03ed
  Author: turturica <Ionut Turturica>
  Date:   2018-04-16 (Mon, 16 Apr 2018)

  Changed paths:
    M _pytest/main.py
    M testing/python/collect.py
    M testing/test_collection.py

  Log Message:
  -----------
  Fix test collection when tests are passed as IDs at the command line. Note 
this is still broken due to #3358.


  Commit: 7d923c389e554ffd073bb23a208b79fea043fb04
      
https://github.com/pytest-dev/pytest/commit/7d923c389e554ffd073bb23a208b79fea043fb04
  Author: turturica <Ionut Turturica>
  Date:   2018-04-18 (Wed, 18 Apr 2018)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    M _pytest/assertion/rewrite.py
    M _pytest/assertion/util.py
    M _pytest/compat.py
    M _pytest/hookspec.py
    M _pytest/junitxml.py
    M _pytest/mark/__init__.py
    M _pytest/mark/structures.py
    M _pytest/python_api.py
    R changelog/1478.feature
    R changelog/1642.feature.rst
    R changelog/1713.doc.rst
    R changelog/2370.bugfix.rst
    R changelog/2405.feature.rst
    R changelog/2770.feature
    R changelog/2770.removal.rst
    A changelog/3008.bugfix.rst
    A changelog/3008.trivial.rst
    R changelog/3034.feature
    R changelog/3084.removal
    R changelog/3139.feature
    R changelog/3149.feature
    R changelog/3156.feature
    R changelog/3189.feature
    R changelog/3190.feature
    R changelog/3198.feature.rst
    R changelog/3204.feature
    R changelog/3213.feature
    R changelog/3228.trivial.rst
    R changelog/3236.feature.rst
    R changelog/3245.trivial.rst
    R changelog/3246.trival.rst
    R changelog/3250.trivial.rst
    R changelog/3255.feature.rst
    R changelog/3265.trivial.rst
    R changelog/3268.trivial
    R changelog/3291.trivial.rst
    R changelog/3292.trivial.rst
    R changelog/3296.feature
    R changelog/3296.trivial
    R changelog/3297.bugfix.rst
    R changelog/3304.trivial
    R changelog/3308.trivial.rst
    R changelog/3312.feature
    R changelog/3314.bugfix.rst
    A changelog/3339.trivial
    A changelog/3348.bugfix.rst
    A changelog/3360.trivial
    A changelog/3372.bugfix.rst
    M doc/en/development_guide.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/fixture.rst
    M doc/en/reference.rst
    M doc/en/writing_plugins.rst
    M setup.py
    M testing/python/raises.py
    M testing/test_assertrewrite.py
    M testing/test_junitxml.py
    M testing/test_recwarn.py
    M tox.ini

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


  Commit: c416b1d9358e457cbd0d8323ffa3ceeb08d27516
      
https://github.com/pytest-dev/pytest/commit/c416b1d9358e457cbd0d8323ffa3ceeb08d27516
  Author: turturica <Ionut Turturica>
  Date:   2018-04-20 (Fri, 20 Apr 2018)

  Changed paths:
    M _pytest/fixtures.py
    M _pytest/nodes.py
    M _pytest/python.py

  Log Message:
  -----------
  Don't stop at the first package when looking up package-scoped fixtures.
Example:
package1.subpackage1
package1.subpackage2

package1's setup/teardown were executed again when exiting subpackage1 and 
entering subpackage2.


  Commit: e44d4e6508b1ba7b960ec5728000a221315af79b
      
https://github.com/pytest-dev/pytest/commit/e44d4e6508b1ba7b960ec5728000a221315af79b
  Author: turturica <Ionut Turturica>
  Date:   2018-04-20 (Fri, 20 Apr 2018)

  Changed paths:
    M _pytest/monkeypatch.py
    A changelog/3290.feature
    M doc/en/monkeypatch.rst
    M testing/test_monkeypatch.py

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


  Commit: 69031d00337dc61ed1bd41465dd80d5cc2cb793f
      
https://github.com/pytest-dev/pytest/commit/69031d00337dc61ed1bd41465dd80d5cc2cb793f
  Author: turturica <Ionut Turturica>
  Date:   2018-04-20 (Fri, 20 Apr 2018)

  Changed paths:
    M pytest.py

  Log Message:
  -----------
  Forgot one file from previous commit.


  Commit: dc90c9108fd8cc65bc76da7a6d71b6ed66c40256
      
https://github.com/pytest-dev/pytest/commit/dc90c9108fd8cc65bc76da7a6d71b6ed66c40256
  Author: turturica <Ionut Turturica>
  Date:   2018-04-20 (Fri, 20 Apr 2018)

  Changed paths:
    M _pytest/fixtures.py

  Log Message:
  -----------
  Collapse all parent nested package fixtures when pointing to a sub-node.
Example:
Given this hierarchy: p1.s1.s2.s3
I want to run pytest p1/s1/s2/s3/foo.py

If there are any package fixtures defined at p1..s2 levels, they should also be 
executed.


  Commit: b0474398ec13057675cbf9ceace3826bf4e32db9
      
https://github.com/pytest-dev/pytest/commit/b0474398ec13057675cbf9ceace3826bf4e32db9
  Author: turturica <Ionut Turturica>
  Date:   2018-04-20 (Fri, 20 Apr 2018)

  Changed paths:
    M _pytest/fixtures.py

  Log Message:
  -----------
  Fix a formatting error.


  Commit: fedc78522bd43e82d8b6c4f89df2b3a6c8e898ea
      
https://github.com/pytest-dev/pytest/commit/fedc78522bd43e82d8b6c4f89df2b3a6c8e898ea
  Author: turturica <Ionut Turturica>
  Date:   2018-04-21 (Sat, 21 Apr 2018)

  Changed paths:
    M _pytest/main.py
    M testing/test_session.py

  Log Message:
  -----------
  Build a stack of all previous packages instead of just the one closest to the 
initial argument(s).
Address #3358 by caching nodes in a session dict.


  Commit: f8350c63041c8ba042c105fcbf78c9207d3b7dc5
      
https://github.com/pytest-dev/pytest/commit/f8350c63041c8ba042c105fcbf78c9207d3b7dc5
  Author: turturica <Ionut Turturica>
  Date:   2018-04-21 (Sat, 21 Apr 2018)

  Changed paths:
    M _pytest/nodes.py

  Log Message:
  -----------
  Fix an issue that popped up only on Windows.


  Commit: acacf75f49ad79ea8fa5af0852976fa1a406b325
      
https://github.com/pytest-dev/pytest/commit/acacf75f49ad79ea8fa5af0852976fa1a406b325
  Author: turturica <Ionut Turturica>
  Date:   2018-04-24 (Tue, 24 Apr 2018)

  Changed paths:
    M testing/python/fixture.py

  Log Message:
  -----------
  Added another package-scoped fixture test.
Changed existing complex tests to use package fixtures.


  Commit: d483b401ee7f59b8ed433dd31cda482a5822bc8b
      
https://github.com/pytest-dev/pytest/commit/d483b401ee7f59b8ed433dd31cda482a5822bc8b
  Author: turturica <Ionut Turturica>
  Date:   2018-04-24 (Tue, 24 Apr 2018)

  Changed paths:
    M _pytest/fixtures.py
    A changelog/2334.feature
    M testing/python/fixture.py

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


  Commit: 229c8e551d09ae7ed894a2d7d106fefa1307c5a2
      
https://github.com/pytest-dev/pytest/commit/229c8e551d09ae7ed894a2d7d106fefa1307c5a2
  Author: turturica <Ionut Turturica>
  Date:   2018-04-25 (Wed, 25 Apr 2018)

  Changed paths:
    M _pytest/fixtures.py

  Log Message:
  -----------
  Fix parametrized fixtures reordering.


  Commit: 05b5b64379c81d19757241d98054130f4f61fa47
      
https://github.com/pytest-dev/pytest/commit/05b5b64379c81d19757241d98054130f4f61fa47
  Author: turturica <Ionut Turturica>
  Date:   2018-04-25 (Wed, 25 Apr 2018)

  Changed paths:
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M _pytest/compat.py
    M _pytest/helpconfig.py
    M _pytest/logging.py
    M _pytest/main.py
    M _pytest/python.py
    M _pytest/runner.py
    R changelog/3330.trivial.rst
    R changelog/3339.trivial
    R changelog/3348.bugfix.rst
    R changelog/3360.trivial
    R changelog/3372.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.5.1.rst
    M doc/en/builtin.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/fixture.rst
    M doc/en/getting-started.rst
    M doc/en/test/plugin/terminal.rst
    M setup.py
    M testing/acceptance_test.py
    M testing/python/metafunc.py
    M testing/test_runner.py
    M tox.ini

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


  Commit: 6fc7f07a8058d579cae73cc3ae792cd216f90304
      
https://github.com/pytest-dev/pytest/commit/6fc7f07a8058d579cae73cc3ae792cd216f90304
  Author: turturica <Ionut Turturica>
  Date:   2018-04-26 (Thu, 26 Apr 2018)

  Changed paths:
    M _pytest/python.py

  Log Message:
  -----------
  Workaround for py36-xdist failure.


  Commit: 7d0dba18de7dc63468ce09d198e7c53970b37de6
      
https://github.com/pytest-dev/pytest/commit/7d0dba18de7dc63468ce09d198e7c53970b37de6
  Author: turturica <Ionut Turturica>
  Date:   2018-04-27 (Fri, 27 Apr 2018)

  Changed paths:
    M _pytest/fixtures.py
    M _pytest/nodes.py

  Log Message:
  -----------
  Removed _CompatProperty("Package")


  Commit: eb0c6a82875a986d9bf4cf0efdcee5641fe84fef
      
https://github.com/pytest-dev/pytest/commit/eb0c6a82875a986d9bf4cf0efdcee5641fe84fef
  Author: Ronny Pfannschmidt <ronny.pfannschm...@redhat.com>
  Date:   2018-06-13 (Wed, 13 Jun 2018)

  Changed paths:
    M src/_pytest/nodes.py
    M testing/test_mark.py

  Log Message:
  -----------
  fix addmarker - extract mark from markdecorator


  Commit: 791bb3502cc6c0539e9428f49f0082038d46619f
      
https://github.com/pytest-dev/pytest/commit/791bb3502cc6c0539e9428f49f0082038d46619f
  Author: Ronny Pfannschmidt <ronny.pfannschm...@redhat.com>
  Date:   2018-06-13 (Wed, 13 Jun 2018)

  Changed paths:
    A changelog/3576.feature.rst

  Log Message:
  -----------
  changelog


  Commit: b5102d03a62ef5cd7704cadc5e704df3cd812e21
      
https://github.com/pytest-dev/pytest/commit/b5102d03a62ef5cd7704cadc5e704df3cd812e21
  Author: Bruno Oliveira <nicodde...@gmail.com>
  Date:   2018-06-13 (Wed, 13 Jun 2018)

  Changed paths:
    M src/_pytest/nodes.py

  Log Message:
  -----------
  Fix add_marker docs


  Commit: 8d072205e9119ec3c8b95ca66876b9a1a50b6e3e
      
https://github.com/pytest-dev/pytest/commit/8d072205e9119ec3c8b95ca66876b9a1a50b6e3e
  Author: Ronny Pfannschmidt <ronny.pfannschm...@redhat.com>
  Date:   2018-06-13 (Wed, 13 Jun 2018)

  Changed paths:
    M src/_pytest/nodes.py

  Log Message:
  -----------
  fix whitespace


  Commit: 94c41bec64d77f816e7598cc74527377e6bb8536
      
https://github.com/pytest-dev/pytest/commit/94c41bec64d77f816e7598cc74527377e6bb8536
  Author: Bruno Oliveira <nicodde...@gmail.com>
  Date:   2018-06-13 (Wed, 13 Jun 2018)

  Changed paths:
    M CONTRIBUTING.rst
    A changelog/3555.bugfix.rst
    A changelog/3576.feature.rst
    M doc/en/assert.rst
    R doc/en/check_sphinx.py
    R doc/en/genapi.py
    R doc/en/test/attic.rst
    R doc/en/test/config.html
    R doc/en/test/dist.html
    R doc/en/test/extend.html
    R doc/en/test/index.rst
    R doc/en/test/mission.rst
    R doc/en/test/plugin/cov.rst
    R doc/en/test/plugin/coverage.rst
    R doc/en/test/plugin/django.rst
    R doc/en/test/plugin/figleaf.rst
    R doc/en/test/plugin/helpconfig.rst
    R doc/en/test/plugin/index.rst
    R doc/en/test/plugin/links.rst
    R doc/en/test/plugin/nose.rst
    R doc/en/test/plugin/oejskit.rst
    R doc/en/test/plugin/terminal.rst
    R doc/en/test/plugin/xdist.rst
    R doc/en/test/test.html
    M src/_pytest/mark/structures.py
    M src/_pytest/nodes.py
    M testing/python/integration.py
    M testing/test_mark.py
    M tox.ini

  Log Message:
  -----------
  Merge pull request #3576 from RonnyPfannschmidt/addmarker-api

fix addmarker - extract mark from markdecorator


  Commit: 36159776088c8d9697e09c0c696ed78810a0226e
      
https://github.com/pytest-dev/pytest/commit/36159776088c8d9697e09c0c696ed78810a0226e
  Author: Wil Cooley <wcoo...@nakedape.cc>
  Date:   2018-06-14 (Thu, 14 Jun 2018)

  Changed paths:
    M AUTHORS
    A changelog/3579.feature.rst
    M src/_pytest/logging.py
    M testing/logging/test_fixture.py

  Log Message:
  -----------
  Add `messages` property to `caplog` fixture.


  Commit: 3dcdaab1038ca5df64d54b3e2474431f7a0bdc9f
      
https://github.com/pytest-dev/pytest/commit/3dcdaab1038ca5df64d54b3e2474431f7a0bdc9f
  Author: Bruno Oliveira <nicodde...@gmail.com>
  Date:   2018-06-15 (Fri, 15 Jun 2018)

  Changed paths:
    M AUTHORS
    A changelog/3579.feature.rst
    M src/_pytest/logging.py
    M testing/logging/test_fixture.py

  Log Message:
  -----------
  Merge pull request #3585 from wcooley/feature/3579-caplog-messages

Add `messages` property to `caplog` fixture.


  Commit: c081c5ee23200efbad96f20b766f2521272e96f6
      
https://github.com/pytest-dev/pytest/commit/c081c5ee23200efbad96f20b766f2521272e96f6
  Author: Ronny Pfannschmidt <ronny.pfannschm...@redhat.com>
  Date:   2018-06-15 (Fri, 15 Jun 2018)

  Changed paths:
    A testing/example_scripts/issue_519.py
    M tox.ini

  Log Message:
  -----------
  add example scripts for issue #519


  Commit: ea906056fae49705e9e3c7e941eb9068131eb14e
      
https://github.com/pytest-dev/pytest/commit/ea906056fae49705e9e3c7e941eb9068131eb14e
  Author: Ronny Pfannschmidt <ronny.pfannschm...@redhat.com>
  Date:   2018-06-15 (Fri, 15 Jun 2018)

  Changed paths:
    M testing/example_scripts/issue_519.py

  Log Message:
  -----------
  add the actually expected fixtureorder for #519


  Commit: 3ac2ae3c8caab9c7338878e9825ea2f383ca9265
      
https://github.com/pytest-dev/pytest/commit/3ac2ae3c8caab9c7338878e9825ea2f383ca9265
  Author: Ronny Pfannschmidt <ronny.pfannschm...@redhat.com>
  Date:   2018-06-15 (Fri, 15 Jun 2018)

  Changed paths:
    M testing/example_scripts/issue_519.py

  Log Message:
  -----------
  black


  Commit: 99402cf1c05720ee2ab8465262c7da8e412b6c5e
      
https://github.com/pytest-dev/pytest/commit/99402cf1c05720ee2ab8465262c7da8e412b6c5e
  Author: Ronny Pfannschmidt <ronny.pfannschm...@redhat.com>
  Date:   2018-06-15 (Fri, 15 Jun 2018)

  Changed paths:
    A testing/example_scripts/README.rst

  Log Message:
  -----------
  add a readme to the example scripts


  Commit: 9e32b6ae4874530acf93aab547e4e30b75f65e97
      
https://github.com/pytest-dev/pytest/commit/9e32b6ae4874530acf93aab547e4e30b75f65e97
  Author: Bruno Oliveira <nicodde...@gmail.com>
  Date:   2018-06-15 (Fri, 15 Jun 2018)

  Changed paths:
    M testing/example_scripts/README.rst

  Log Message:
  -----------
  Small typo and grammar fix


  Commit: 9d60cf25c0cb43a78ca8249108e509382e17f1c4
      
https://github.com/pytest-dev/pytest/commit/9d60cf25c0cb43a78ca8249108e509382e17f1c4
  Author: Bruno Oliveira <nicodde...@gmail.com>
  Date:   2018-06-15 (Fri, 15 Jun 2018)

  Changed paths:
    A testing/example_scripts/README.rst
    A testing/example_scripts/issue_519.py
    M tox.ini

  Log Message:
  -----------
  Merge pull request #2207 from RonnyPfannschmidt/fix/519

add example scripts for issue #519


  Commit: 31f089db6ade6e345f4cab23fe4fa0a838c34f47
      
https://github.com/pytest-dev/pytest/commit/31f089db6ade6e345f4cab23fe4fa0a838c34f47
  Author: avirlrma <aviral1...@gmail.com>
  Date:   2018-06-21 (Thu, 21 Jun 2018)

  Changed paths:
    M src/_pytest/cacheprovider.py

  Log Message:
  -----------
  add reamde for .pytest_cache
method - `ensure_readme()`


  Commit: 53d4710c6287fc3e78c2bc1704bd702d05a8b6de
      
https://github.com/pytest-dev/pytest/commit/53d4710c6287fc3e78c2bc1704bd702d05a8b6de
  Author: avirlrma <aviral1...@gmail.com>
  Date:   2018-06-21 (Thu, 21 Jun 2018)

  Changed paths:
    M src/_pytest/cacheprovider.py
    A testing/test_cacheREADME.py

  Log Message:
  -----------
  added tests for .pytest_cache README
 Helper class to check if readme exists in .pytest_cache directory
 Tests to check for readme when tests pass and when they fail


  Commit: 8f1d8ac970efb1fb5c00af4a0c5575922577afda
      
https://github.com/pytest-dev/pytest/commit/8f1d8ac970efb1fb5c00af4a0c5575922577afda
  Author: avirlrma <aviral1...@gmail.com>
  Date:   2018-06-21 (Thu, 21 Jun 2018)

  Changed paths:
    M src/_pytest/cacheprovider.py
    M testing/test_cacheREADME.py

  Log Message:
  -----------
  fixed linting errors
ran black
removed unused imports and variables


  Commit: c672bfa32ea9e3602225eb45b0ffdc4cdb1ce47a
      
https://github.com/pytest-dev/pytest/commit/c672bfa32ea9e3602225eb45b0ffdc4cdb1ce47a
  Author: avirlrma <aviral1...@gmail.com>
  Date:   2018-06-21 (Thu, 21 Jun 2018)

  Changed paths:
    A changelog/3519.feature.rst
    M src/_pytest/cacheprovider.py
    R testing/test_cacheREADME.py
    M testing/test_cacheprovider.py

  Log Message:
  -----------
  added changelog entry
moved cache readme tests to test_cacheprovider.py


  Commit: 998d540b73df9a12975b1d3cacb13b540500c6d4
      
https://github.com/pytest-dev/pytest/commit/998d540b73df9a12975b1d3cacb13b540500c6d4
  Author: avirlrma <aviral1...@gmail.com>
  Date:   2018-06-21 (Thu, 21 Jun 2018)

  Changed paths:
    M changelog/3519.feature.rst

  Log Message:
  -----------
  fixed changelog entry


  Commit: b897008887efba5beea1b1aaa517abb09da13a7b
      
https://github.com/pytest-dev/pytest/commit/b897008887efba5beea1b1aaa517abb09da13a7b
  Author: Bruno Oliveira <nicodde...@gmail.com>
  Date:   2018-06-21 (Thu, 21 Jun 2018)

  Changed paths:
    M changelog/3519.feature.rst

  Log Message:
  -----------
  Improve CHANGELOG grammar


  Commit: eb94bce3e272bdfc45220208cb070ff908d532b0
      
https://github.com/pytest-dev/pytest/commit/eb94bce3e272bdfc45220208cb070ff908d532b0
  Author: Bruno Oliveira <nicodde...@gmail.com>
  Date:   2018-06-21 (Thu, 21 Jun 2018)

  Changed paths:
    R changelog/3519.feature.rst
    A changelog/3519.trivial.rst

  Log Message:
  -----------
  Change 3519 to trivial


  Commit: 0d3914b62691ef4dbb38a897b7b4a8513b2912e9
      
https://github.com/pytest-dev/pytest/commit/0d3914b62691ef4dbb38a897b7b4a8513b2912e9
  Author: Bruno Oliveira <nicodde...@gmail.com>
  Date:   2018-06-21 (Thu, 21 Jun 2018)

  Changed paths:
    M src/_pytest/cacheprovider.py

  Log Message:
  -----------
  Remove extra '\' left at the end of a line in cache's readme contents


  Commit: de98939ebf78913cd20ce2f335c0b15deaa6798f
      
https://github.com/pytest-dev/pytest/commit/de98939ebf78913cd20ce2f335c0b15deaa6798f
  Author: Bruno Oliveira <nicodde...@gmail.com>
  Date:   2018-06-21 (Thu, 21 Jun 2018)

  Changed paths:
    A changelog/3519.trivial.rst
    M src/_pytest/cacheprovider.py
    M testing/test_cacheprovider.py

  Log Message:
  -----------
  Merge pull request #3608 from avirlrma/features

add reamde for .pytest_cache


  Commit: c7eb53317b4535cabd50d817964ca7e4644cdcf9
      
https://github.com/pytest-dev/pytest/commit/c7eb53317b4535cabd50d817964ca7e4644cdcf9
  Author: Ronny Pfannschmidt <ronny.pfannschm...@redhat.com>
  Date:   2018-06-22 (Fri, 22 Jun 2018)

  Changed paths:
    M setup.py
    M src/_pytest/cacheprovider.py
    M src/_pytest/compat.py
    M testing/test_cacheprovider.py

  Log Message:
  -----------
  port cache plugin internals to pathlib

warning logging got broken by detanglement from config


  Commit: 23581d44bd94a54eeb10f43a5a317420db02b269
      
https://github.com/pytest-dev/pytest/commit/23581d44bd94a54eeb10f43a5a317420db02b269
  Author: Ronny Pfannschmidt <ronny.pfannschm...@redhat.com>
  Date:   2018-06-22 (Fri, 22 Jun 2018)

  Changed paths:
    A src/_pytest/paths.py

  Log Message:
  -----------
  add missed file


  Commit: fb992a0c81e02e9a298a7aa38d46001229a14571
      
https://github.com/pytest-dev/pytest/commit/fb992a0c81e02e9a298a7aa38d46001229a14571
  Author: Ronny Pfannschmidt <ronny.pfannschm...@redhat.com>
  Date:   2018-06-22 (Fri, 22 Jun 2018)

  Changed paths:
    M src/_pytest/cacheprovider.py

  Log Message:
  -----------
  reorder attr.ib specs


  Commit: ab80e0fba087b099445c1d57b661cfed1638096b
      
https://github.com/pytest-dev/pytest/commit/ab80e0fba087b099445c1d57b661cfed1638096b
  Author: Ronny Pfannschmidt <ronny.pfannschm...@redhat.com>
  Date:   2018-06-22 (Fri, 22 Jun 2018)

  Changed paths:
    M src/_pytest/compat.py

  Log Message:
  -----------
  sort compat flake8 mess correctly


  Commit: 1226cdab47335bb823b2fee092b94b1c37b0a62a
      
https://github.com/pytest-dev/pytest/commit/1226cdab47335bb823b2fee092b94b1c37b0a62a
  Author: Ronny Pfannschmidt <ronny.pfannschm...@redhat.com>
  Date:   2018-06-22 (Fri, 22 Jun 2018)

  Changed paths:
    M src/_pytest/cacheprovider.py

  Log Message:
  -----------
  fix warnings and json dumping of cacheprovider


  Commit: abbf73ad1a3b5d8d4522df2ca2d3f0c83ea8e349
      
https://github.com/pytest-dev/pytest/commit/abbf73ad1a3b5d8d4522df2ca2d3f0c83ea8e349
  Author: Ronny Pfannschmidt <ronny.pfannschm...@redhat.com>
  Date:   2018-06-22 (Fri, 22 Jun 2018)

  Changed paths:
    M setup.py
    M src/_pytest/compat.py

  Log Message:
  -----------
  use pathlib2 up to python3.4 - damn the stdlib


  Commit: 603df1ea1c638c0b704b5d135c03b00384cce0f9
      
https://github.com/pytest-dev/pytest/commit/603df1ea1c638c0b704b5d135c03b00384cce0f9
  Author: Ronny Pfannschmidt <ronny.pfannschm...@redhat.com>
  Date:   2018-06-22 (Fri, 22 Jun 2018)

  Changed paths:
    M setup.py
    M src/_pytest/compat.py

  Log Message:
  -----------
  whops, its supported starting with python 3.6, not python 3.5


  Commit: ee30bf45c99f1fd8f4ba9bc26a2b77b3a6aae5c6
      
https://github.com/pytest-dev/pytest/commit/ee30bf45c99f1fd8f4ba9bc26a2b77b3a6aae5c6
  Author: Ronny Pfannschmidt <ronny.pfannschm...@redhat.com>
  Date:   2018-06-23 (Sat, 23 Jun 2018)

  Changed paths:
    M src/_pytest/cacheprovider.py
    M testing/test_cacheprovider.py

  Log Message:
  -----------
  rebase onto readme addition


  Commit: c4c666cbc43e66475618d8fe94cd9dd167140a2d
      
https://github.com/pytest-dev/pytest/commit/c4c666cbc43e66475618d8fe94cd9dd167140a2d
  Author: Ronny Pfannschmidt <ronny.pfannschm...@redhat.com>
  Date:   2018-06-23 (Sat, 23 Jun 2018)

  Changed paths:
    M src/_pytest/cacheprovider.py

  Log Message:
  -----------
  use Pathlib instead of path splitting


  Commit: 95f00de0df0447cf39af2b90aa1ec34e4e1ec163
      
https://github.com/pytest-dev/pytest/commit/95f00de0df0447cf39af2b90aa1ec34e4e1ec163
  Author: Ronny Pfannschmidt <ronny.pfannschm...@redhat.com>
  Date:   2018-06-23 (Sat, 23 Jun 2018)

  Changed paths:
    M src/_pytest/cacheprovider.py

  Log Message:
  -----------
  use paths for config.cache.get key


  Commit: 5a156b364519658daf0230b446d97967c3d0e4b9
      
https://github.com/pytest-dev/pytest/commit/5a156b364519658daf0230b446d97967c3d0e4b9
  Author: Ronny Pfannschmidt <ronny.pfannschm...@redhat.com>
  Date:   2018-06-24 (Sun, 24 Jun 2018)

  Changed paths:
    M appveyor.yml

  Log Message:
  -----------
  disable pypy on windows until scandir works for it


  Commit: 5b186cd609ae651a5a7e4f0cf1bbef466b51345d
      
https://github.com/pytest-dev/pytest/commit/5b186cd609ae651a5a7e4f0cf1bbef466b51345d
  Author: Bruno Oliveira <nicodde...@gmail.com>
  Date:   2018-06-25 (Mon, 25 Jun 2018)

  Changed paths:
    M appveyor.yml
    M setup.py
    M src/_pytest/cacheprovider.py
    M src/_pytest/compat.py
    A src/_pytest/paths.py
    M testing/test_cacheprovider.py

  Log Message:
  -----------
  Merge pull request #3594 from pytest-dev/interal-pathlib

[WIP] port cache plugin internals to pathlib


  Commit: 89e0a3ec27309e0f2c27887c2eaee8fde612d460
      
https://github.com/pytest-dev/pytest/commit/89e0a3ec27309e0f2c27887c2eaee8fde612d460
  Author: Ronny Pfannschmidt <ronny.pfannschm...@redhat.com>
  Date:   2018-06-26 (Tue, 26 Jun 2018)

  Changed paths:
    M .pre-commit-config.yaml
    M .travis.yml
    M AUTHORS
    M CHANGELOG.rst
    M appveyor.yml
    A changelog/3061.bugfix.rst
    R changelog/3545.trivial.rst
    R changelog/3549.doc.rst
    R changelog/3552.trivial.rst
    R changelog/3555.bugfix.rst
    R changelog/3563.bugfix.rst
    R changelog/3567.trivial.rst
    R changelog/3569.bugfix.rst
    A changelog/3593.bugfix.rst
    A changelog/3598.trivial.rst
    A changelog/3609.trivial.rst
    A changelog/3611.doc.rst
    M doc/en/announce/index.rst
    M doc/en/announce/release-2.4.0.rst
    A doc/en/announce/release-3.6.2.rst
    M doc/en/example/assertion/failure_demo.py
    M doc/en/example/assertion/test_failures.py
    M doc/en/example/assertion/test_setup_flow_example.py
    M doc/en/example/costlysetup/conftest.py
    M doc/en/example/multipython.py
    M doc/en/example/nonpython/conftest.py
    M doc/en/example/py2py3/conftest.py
    M doc/en/example/pythoncollection.py
    M doc/en/example/reportingdemo.rst
    M doc/en/fixture.rst
    M doc/en/reference.rst
    M doc/en/skipping.rst
    M pyproject.toml
    M setup.py
    M src/_pytest/_code/code.py
    M src/_pytest/_code/source.py
    M src/_pytest/assertion/rewrite.py
    M src/_pytest/assertion/util.py
    M src/_pytest/cacheprovider.py
    M src/_pytest/capture.py
    M src/_pytest/compat.py
    R src/_pytest/config.py
    A src/_pytest/config/__init__.py
    A src/_pytest/config/argparsing.py
    A src/_pytest/config/exceptions.py
    A src/_pytest/config/findpaths.py
    M src/_pytest/debugging.py
    M src/_pytest/deprecated.py
    M src/_pytest/doctest.py
    M src/_pytest/fixtures.py
    M src/_pytest/helpconfig.py
    M src/_pytest/junitxml.py
    M src/_pytest/logging.py
    M src/_pytest/main.py
    M src/_pytest/mark/evaluate.py
    M src/_pytest/mark/structures.py
    M src/_pytest/monkeypatch.py
    M src/_pytest/nodes.py
    M src/_pytest/outcomes.py
    M src/_pytest/pytester.py
    M src/_pytest/python.py
    M src/_pytest/python_api.py
    M src/_pytest/recwarn.py
    M src/_pytest/resultlog.py
    M src/_pytest/runner.py
    M src/_pytest/skipping.py
    M src/_pytest/terminal.py
    M src/_pytest/unittest.py
    M src/_pytest/warnings.py
    M tasks/generate.py
    M testing/acceptance_test.py
    M testing/code/test_code.py
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    M testing/code/test_source_multiline_block.py
    M testing/deprecated_test.py
    M testing/example_scripts/issue_519.py
    M testing/logging/test_formatter.py
    M testing/logging/test_reporting.py
    M testing/python/approx.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/integration.py
    M testing/python/metafunc.py
    M testing/python/raises.py
    M testing/test_argcomplete.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_cacheprovider.py
    M testing/test_capture.py
    M testing/test_collection.py
    M testing/test_compat.py
    M testing/test_config.py
    M testing/test_conftest.py
    M testing/test_doctest.py
    M testing/test_junitxml.py
    M testing/test_mark.py
    M testing/test_monkeypatch.py
    M testing/test_nose.py
    M testing/test_parseopt.py
    M testing/test_pastebin.py
    M testing/test_pdb.py
    M testing/test_pluginmanager.py
    M testing/test_pytester.py
    M testing/test_recwarn.py
    M testing/test_runner.py
    M testing/test_session.py
    M testing/test_skipping.py
    M testing/test_terminal.py
    M testing/test_tmpdir.py
    M testing/test_unittest.py
    M testing/test_warnings.py
    M tox.ini

  Log Message:
  -----------
  merge from master to features


  Commit: 6b239263da3c8a2d1e659584a0c16a77875a9f00
      
https://github.com/pytest-dev/pytest/commit/6b239263da3c8a2d1e659584a0c16a77875a9f00
  Author: Ronny Pfannschmidt <opensou...@ronnypfannschmidt.de>
  Date:   2018-06-26 (Tue, 26 Jun 2018)

  Changed paths:
    M .pre-commit-config.yaml
    M .travis.yml
    M AUTHORS
    M CHANGELOG.rst
    M appveyor.yml
    A changelog/3061.bugfix.rst
    R changelog/3545.trivial.rst
    R changelog/3549.doc.rst
    R changelog/3552.trivial.rst
    R changelog/3555.bugfix.rst
    R changelog/3563.bugfix.rst
    R changelog/3567.trivial.rst
    R changelog/3569.bugfix.rst
    A changelog/3593.bugfix.rst
    A changelog/3598.trivial.rst
    A changelog/3609.trivial.rst
    A changelog/3611.doc.rst
    M doc/en/announce/index.rst
    M doc/en/announce/release-2.4.0.rst
    A doc/en/announce/release-3.6.2.rst
    M doc/en/example/assertion/failure_demo.py
    M doc/en/example/assertion/test_failures.py
    M doc/en/example/assertion/test_setup_flow_example.py
    M doc/en/example/costlysetup/conftest.py
    M doc/en/example/multipython.py
    M doc/en/example/nonpython/conftest.py
    M doc/en/example/py2py3/conftest.py
    M doc/en/example/pythoncollection.py
    M doc/en/example/reportingdemo.rst
    M doc/en/fixture.rst
    M doc/en/reference.rst
    M doc/en/skipping.rst
    M pyproject.toml
    M setup.py
    M src/_pytest/_code/code.py
    M src/_pytest/_code/source.py
    M src/_pytest/assertion/rewrite.py
    M src/_pytest/assertion/util.py
    M src/_pytest/cacheprovider.py
    M src/_pytest/capture.py
    M src/_pytest/compat.py
    R src/_pytest/config.py
    A src/_pytest/config/__init__.py
    A src/_pytest/config/argparsing.py
    A src/_pytest/config/exceptions.py
    A src/_pytest/config/findpaths.py
    M src/_pytest/debugging.py
    M src/_pytest/deprecated.py
    M src/_pytest/doctest.py
    M src/_pytest/fixtures.py
    M src/_pytest/helpconfig.py
    M src/_pytest/junitxml.py
    M src/_pytest/logging.py
    M src/_pytest/main.py
    M src/_pytest/mark/evaluate.py
    M src/_pytest/mark/structures.py
    M src/_pytest/monkeypatch.py
    M src/_pytest/nodes.py
    M src/_pytest/outcomes.py
    M src/_pytest/pytester.py
    M src/_pytest/python.py
    M src/_pytest/python_api.py
    M src/_pytest/recwarn.py
    M src/_pytest/resultlog.py
    M src/_pytest/runner.py
    M src/_pytest/skipping.py
    M src/_pytest/terminal.py
    M src/_pytest/unittest.py
    M src/_pytest/warnings.py
    M tasks/generate.py
    M testing/acceptance_test.py
    M testing/code/test_code.py
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    M testing/code/test_source_multiline_block.py
    M testing/deprecated_test.py
    M testing/example_scripts/issue_519.py
    M testing/logging/test_formatter.py
    M testing/logging/test_reporting.py
    M testing/python/approx.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/integration.py
    M testing/python/metafunc.py
    M testing/python/raises.py
    M testing/test_argcomplete.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_cacheprovider.py
    M testing/test_capture.py
    M testing/test_collection.py
    M testing/test_compat.py
    M testing/test_config.py
    M testing/test_conftest.py
    M testing/test_doctest.py
    M testing/test_junitxml.py
    M testing/test_mark.py
    M testing/test_monkeypatch.py
    M testing/test_nose.py
    M testing/test_parseopt.py
    M testing/test_pastebin.py
    M testing/test_pdb.py
    M testing/test_pluginmanager.py
    M testing/test_pytester.py
    M testing/test_recwarn.py
    M testing/test_runner.py
    M testing/test_session.py
    M testing/test_skipping.py
    M testing/test_terminal.py
    M testing/test_tmpdir.py
    M testing/test_unittest.py
    M testing/test_warnings.py
    M tox.ini

  Log Message:
  -----------
  Merge pull request #3620 from RonnyPfannschmidt/merge-from-master

Merge from master


  Commit: cc6eb9f83c9a12cc4416ef03c022c3eb4bc2ee22
      
https://github.com/pytest-dev/pytest/commit/cc6eb9f83c9a12cc4416ef03c022c3eb4bc2ee22
  Author: Ronny Pfannschmidt <ronny.pfannschm...@redhat.com>
  Date:   2018-06-26 (Tue, 26 Jun 2018)

  Changed paths:
    A src/_pytest/reports.py
    M src/_pytest/runner.py
    M testing/test_junitxml.py
    M testing/test_runner.py

  Log Message:
  -----------
  move test reports to own file


  Commit: 2dfb52f7e069f128964ccd9b5af0ddd9b021648b
      
https://github.com/pytest-dev/pytest/commit/2dfb52f7e069f128964ccd9b5af0ddd9b021648b
  Author: Ronny Pfannschmidt <ronny.pfannschm...@redhat.com>
  Date:   2018-06-26 (Tue, 26 Jun 2018)

  Changed paths:
    M src/_pytest/reports.py
    M src/_pytest/runner.py

  Log Message:
  -----------
  fix rebase artifacts


  Commit: 0672bc633ff64d33a529824686ae8402f419708d
      
https://github.com/pytest-dev/pytest/commit/0672bc633ff64d33a529824686ae8402f419708d
  Author: Ronny Pfannschmidt <ronny.pfannschm...@redhat.com>
  Date:   2018-06-26 (Tue, 26 Jun 2018)

  Changed paths:
    M src/_pytest/pytester.py
    M tox.ini

  Log Message:
  -----------
  enable pytester to run examples copied from the cwd


  Commit: e860ff7299fa3618db73cffbadeb95b135754a08
      
https://github.com/pytest-dev/pytest/commit/e860ff7299fa3618db73cffbadeb95b135754a08
  Author: Ronny Pfannschmidt <ronny.pfannschm...@redhat.com>
  Date:   2018-06-26 (Tue, 26 Jun 2018)

  Changed paths:
    M src/_pytest/pytester.py
    M testing/acceptance_test.py
    A testing/example_scripts/conftest_usageerror/conftest.py
    A testing/example_scripts/issue88_initial_file_multinodes/conftest.py
    A testing/example_scripts/issue88_initial_file_multinodes/test_hello.py
    A testing/examples/test_issue519.py

  Log Message:
  -----------
  port some acceptance tests over to copy_example


  Commit: 581d49635e29c91084227f2263435a15606981b4
      
https://github.com/pytest-dev/pytest/commit/581d49635e29c91084227f2263435a15606981b4
  Author: Ronny Pfannschmidt <ronny.pfannschm...@redhat.com>
  Date:   2018-06-27 (Wed, 27 Jun 2018)

  Changed paths:
    A changelog/3623.feature.rst
    A src/_pytest/experiments.py
    M src/_pytest/pytester.py
    M tox.ini

  Log Message:
  -----------
  add docs and changelog


  Commit: 8a6345515b9e1f9d8d54a46bc913b15a09c6e1f7
      
https://github.com/pytest-dev/pytest/commit/8a6345515b9e1f9d8d54a46bc913b15a09c6e1f7
  Author: Ronny Pfannschmidt <ronny.pfannschm...@redhat.com>
  Date:   2018-06-27 (Wed, 27 Jun 2018)

  Changed paths:
    M doc/en/example/reportingdemo.rst
    M doc/en/writing_plugins.rst

  Log Message:
  -----------
  regendoc


  Commit: 17e01993d9a751a0d04b72991faddebad38183a4
      
https://github.com/pytest-dev/pytest/commit/17e01993d9a751a0d04b72991faddebad38183a4
  Author: Ronny Pfannschmidt <ronny.pfannschm...@redhat.com>
  Date:   2018-06-27 (Wed, 27 Jun 2018)

  Changed paths:
    M doc/en/writing_plugins.rst
    M src/_pytest/experiments.py

  Log Message:
  -----------
  regendoc and invocation fixes


  Commit: ea379ba10f03767b8c51fa80206e8a71e1b1cc0a
      
https://github.com/pytest-dev/pytest/commit/ea379ba10f03767b8c51fa80206e8a71e1b1cc0a
  Author: Bruno Oliveira <nicodde...@gmail.com>
  Date:   2018-06-27 (Wed, 27 Jun 2018)

  Changed paths:
    A changelog/3623.feature.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/writing_plugins.rst
    A src/_pytest/experiments.py
    M src/_pytest/pytester.py
    M testing/acceptance_test.py
    A testing/example_scripts/conftest_usageerror/conftest.py
    A testing/example_scripts/issue88_initial_file_multinodes/conftest.py
    A testing/example_scripts/issue88_initial_file_multinodes/test_hello.py
    A testing/examples/test_issue519.py
    M tox.ini

  Log Message:
  -----------
  Merge pull request #3623 from RonnyPfannschmidt/pytester-runexamples

Pytester runexamples


  Commit: e9371a58a0d1562f9d187778e67a7fae3708261f
      
https://github.com/pytest-dev/pytest/commit/e9371a58a0d1562f9d187778e67a7fae3708261f
  Author: Bruno Oliveira <nicodde...@gmail.com>
  Date:   2018-06-27 (Wed, 27 Jun 2018)

  Changed paths:
    A src/_pytest/reports.py
    M src/_pytest/runner.py
    M testing/test_junitxml.py
    M testing/test_runner.py

  Log Message:
  -----------
  Merge pull request #3622 from RonnyPfannschmidt/builtin-serialize

move report classes to own file to prepare for serialisazion


  Commit: 1dc5e97ac255b3a50b80b2a5400d7d467e952532
      
https://github.com/pytest-dev/pytest/commit/1dc5e97ac255b3a50b80b2a5400d7d467e952532
  Author: Serhii Mozghovyi <egnart...@gmail.com>
  Date:   2018-06-28 (Thu, 28 Jun 2018)

  Changed paths:
    M src/_pytest/fixtures.py
    M src/_pytest/python.py
    M testing/python/collect.py

  Log Message:
  -----------
  Make test parametrization override indirect fixtures


  Commit: c220fb235a08d1e5ae892c10566a350a8a08a89b
      
https://github.com/pytest-dev/pytest/commit/c220fb235a08d1e5ae892c10566a350a8a08a89b
  Author: Serhii Mozghovyi <egnart...@gmail.com>
  Date:   2018-06-28 (Thu, 28 Jun 2018)

  Changed paths:
    M src/_pytest/fixtures.py

  Log Message:
  -----------
  Minor fix (code improvement)


  Commit: 3c73d6298a53733d6fea4d7fd12be64c77e8e1f3
      
https://github.com/pytest-dev/pytest/commit/3c73d6298a53733d6fea4d7fd12be64c77e8e1f3
  Author: Ronny Pfannschmidt <ronny.pfannschm...@redhat.com>
  Date:   2018-06-28 (Thu, 28 Jun 2018)

  Changed paths:
    A changelog/3605.bugfix.rst
    M src/_pytest/mark/structures.py
    M src/_pytest/python.py
    M testing/test_mark.py

  Log Message:
  -----------
  merge from master to features


  Commit: 7b47dfb74401ff59b9f95a8f9ac195ecbeaf05bd
      
https://github.com/pytest-dev/pytest/commit/7b47dfb74401ff59b9f95a8f9ac195ecbeaf05bd
  Author: Bruno Oliveira <nicodde...@gmail.com>
  Date:   2018-06-28 (Thu, 28 Jun 2018)

  Changed paths:
    A changelog/3605.bugfix.rst
    M src/_pytest/mark/structures.py
    M src/_pytest/python.py
    M testing/test_mark.py

  Log Message:
  -----------
  Merge pull request #3634 from RonnyPfannschmidt/merge-from-master

Merge from master


  Commit: 76ac670f7d6a249bf2fba0a151cc4e742c1fc2e0
      
https://github.com/pytest-dev/pytest/commit/76ac670f7d6a249bf2fba0a151cc4e742c1fc2e0
  Author: Serhii Mozghovyi <egnart...@gmail.com>
  Date:   2018-06-28 (Thu, 28 Jun 2018)

  Changed paths:
    M AUTHORS
    A changelog/2220.bugfix.rst

  Log Message:
  -----------
  Add changelog description


  Commit: 8680dfc939648768ebff3600757dbfda11099f5f
      
https://github.com/pytest-dev/pytest/commit/8680dfc939648768ebff3600757dbfda11099f5f
  Author: Bruno Oliveira <nicodde...@gmail.com>
  Date:   2018-06-28 (Thu, 28 Jun 2018)

  Changed paths:
    M AUTHORS
    M appveyor.yml
    A changelog/2220.bugfix.rst
    M src/_pytest/fixtures.py
    M src/_pytest/python.py
    M testing/python/collect.py

  Log Message:
  -----------
  Merge pull request #3629 from egnartsms/issue-2220-param-breaks-dep

Make test parametrization override indirect fixtures


  Commit: 7845ab4bc3e689a9e2e9c17a763da69d299adc47
      
https://github.com/pytest-dev/pytest/commit/7845ab4bc3e689a9e2e9c17a763da69d299adc47
  Author: Ronny Pfannschmidt <ronny.pfannschm...@redhat.com>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

  Changed paths:
    M testing/python/fixture.py

  Log Message:
  -----------
  remove test file formatting from TestContextManagerFixtureFuncs


  Commit: 982b6140107c52c54e78df99293aa0e70a7d1619
      
https://github.com/pytest-dev/pytest/commit/982b6140107c52c54e78df99293aa0e70a7d1619
  Author: Ronny Pfannschmidt <ronny.pfannschm...@redhat.com>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

  Changed paths:
    M testing/python/fixture.py

  Log Message:
  -----------
  remove format calls for most fixture tests


  Commit: 5582ad0445029672daf0f18fb12a3d940dbc6bb7
      
https://github.com/pytest-dev/pytest/commit/5582ad0445029672daf0f18fb12a3d940dbc6bb7
  Author: Ronny Pfannschmidt <ronny.pfannschm...@redhat.com>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

  Changed paths:
    M testing/python/fixture.py

  Log Message:
  -----------
  remove use of formatting in test_func_closure_module_auto

this makes it apparent that pytester should supply some kind of variable support


  Commit: 4ae7e9788c67cb723ccfa7f1a5987d6db451b27b
      
https://github.com/pytest-dev/pytest/commit/4ae7e9788c67cb723ccfa7f1a5987d6db451b27b
  Author: Ronny Pfannschmidt <ronny.pfannschm...@redhat.com>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

  Changed paths:
    M testing/python/fixture.py

  Log Message:
  -----------
  fix quotes in scope order test


  Commit: 0fd86ec8a815dc84522d4407c8b6aa912153663b
      
https://github.com/pytest-dev/pytest/commit/0fd86ec8a815dc84522d4407c8b6aa912153663b
  Author: Ronny Pfannschmidt <ronny.pfannschm...@redhat.com>
  Date:   2018-06-29 (Fri, 29 Jun 2018)

  Changed paths:
    M src/_pytest/pytester.py
    A 
testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub1/__init__.py
    A 
testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub1/conftest.py
    A 
testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub1/test_in_sub1.py
    A 
testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub2/__init__.py
    A 
testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub2/conftest.py
    A 
testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub2/test_in_sub2.py
    A 
testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/conftest.py
    A 
testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/pkg/__init__.py
    A 
testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/pkg/conftest.py
    A 
testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/pkg/test_spam.py
    A 
testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_module/conftest.py
    A 
testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_module/test_extend_fixture_conftest_module.py
    A 
testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_module_class.py
    A testing/example_scripts/fixtures/fill_fixtures/test_funcarg_basic.py
    A 
testing/example_scripts/fixtures/fill_fixtures/test_funcarg_lookup_classlevel.py
    A 
testing/example_scripts/fixtures/fill_fixtures/test_funcarg_lookup_modulelevel.py
    A testing/example_scripts/fixtures/fill_fixtures/test_funcarg_lookupfails.py
    M testing/python/fixture.py

  Log Message:
  -----------
  move some fill fixture acceptance tests contents to the examples script folder


  Commit: 54d3cd587d17534b9d969855c7019567d48aa528
      
https://github.com/pytest-dev/pytest/commit/54d3cd587d17534b9d969855c7019567d48aa528
  Author: Jeffrey Rackauckas <jeffreyr...@gmail.com>
  Date:   2018-06-30 (Sat, 30 Jun 2018)

  Changed paths:
    M src/_pytest/debugging.py

  Log Message:
  -----------
  Adding the --trace option.


  Commit: 952bbefaac3836e4c4a8ae6e0919dabcb90a448a
      
https://github.com/pytest-dev/pytest/commit/952bbefaac3836e4c4a8ae6e0919dabcb90a448a
  Author: Jeffrey Rackauckas <jeffreyr...@gmail.com>
  Date:   2018-06-30 (Sat, 30 Jun 2018)

  Changed paths:
    M testing/test_pdb.py

  Log Message:
  -----------
  Add initial test.


  Commit: a46b94950c7574f94315a29b661f38e4176e72b9
      
https://github.com/pytest-dev/pytest/commit/a46b94950c7574f94315a29b661f38e4176e72b9
  Author: Jeffrey Rackauckas <jeffreyr...@gmail.com>
  Date:   2018-06-30 (Sat, 30 Jun 2018)

  Changed paths:
    M src/_pytest/debugging.py

  Log Message:
  -----------
  Properly set immediately_break value


  Commit: 533f4cc10cf95933c532bac78e60bed38001ee52
      
https://github.com/pytest-dev/pytest/commit/533f4cc10cf95933c532bac78e60bed38001ee52
  Author: Jeffrey Rackauckas <jeffreyr...@gmail.com>
  Date:   2018-06-30 (Sat, 30 Jun 2018)

  Changed paths:
    M testing/test_pdb.py

  Log Message:
  -----------
  Fix test to pass


  Commit: 57198d477b5f8f6299c8c56fd075603194063868
      
https://github.com/pytest-dev/pytest/commit/57198d477b5f8f6299c8c56fd075603194063868
  Author: Jeffrey Rackauckas <jeffreyr...@gmail.com>
  Date:   2018-07-01 (Sun, 01 Jul 2018)

  Changed paths:
    A changelog/3610.feature.rst

  Log Message:
  -----------
  Adding changelog entry for the --trace option.


  Commit: 713d32c4da34abaaea77fec3e1211f28206e154f
      
https://github.com/pytest-dev/pytest/commit/713d32c4da34abaaea77fec3e1211f28206e154f
  Author: Jeffrey Rackauckas <jeffreyr...@gmail.com>
  Date:   2018-07-01 (Sun, 01 Jul 2018)

  Changed paths:
    M doc/en/usage.rst

  Log Message:
  -----------
  Adding documentation for the --trace option.


  Commit: 66fa6bb42ed511fb7e3628a61233f050597fb913
      
https://github.com/pytest-dev/pytest/commit/66fa6bb42ed511fb7e3628a61233f050597fb913
  Author: Jeffrey Rackauckas <jeffreyr...@gmail.com>
  Date:   2018-07-01 (Sun, 01 Jul 2018)

  Changed paths:
    M src/_pytest/debugging.py

  Log Message:
  -----------
  Fix flake8 issues.


  Commit: a604a71185f8a63e21a32e2619c5fc3fc93159f6
      
https://github.com/pytest-dev/pytest/commit/a604a71185f8a63e21a32e2619c5fc3fc93159f6
  Author: Jeffrey Rackauckas <jeffreyr...@gmail.com>
  Date:   2018-07-01 (Sun, 01 Jul 2018)

  Changed paths:
    M doc/en/usage.rst

  Log Message:
  -----------
  Fixing usage.rst title.


  Commit: 88011622751fd6280d8aad02ca924aae066b6df8
      
https://github.com/pytest-dev/pytest/commit/88011622751fd6280d8aad02ca924aae066b6df8
  Author: Jeffrey Rackauckas <jeffreyr...@gmail.com>
  Date:   2018-07-01 (Sun, 01 Jul 2018)

  Changed paths:
    M doc/en/usage.rst

  Log Message:
  -----------
  Fixing tabbing in usage.rst.


  Commit: 0b704779309332de3937bfa94eb3eb0b43b055c3
      
https://github.com/pytest-dev/pytest/commit/0b704779309332de3937bfa94eb3eb0b43b055c3
  Author: Jeffrey Rackauckas <jeffreyr...@gmail.com>
  Date:   2018-07-01 (Sun, 01 Jul 2018)

  Changed paths:
    M changelog/3610.feature.rst
    M doc/en/usage.rst
    M src/_pytest/debugging.py
    M testing/test_pdb.py

  Log Message:
  -----------
  Fix linting issues.


  Commit: bc268a58d13ab398fac9c3c7d651296426d2fbb2
      
https://github.com/pytest-dev/pytest/commit/bc268a58d13ab398fac9c3c7d651296426d2fbb2
  Author: Jeffrey Rackauckas <jeffreyr...@gmail.com>
  Date:   2018-07-01 (Sun, 01 Jul 2018)

  Changed paths:
    M testing/test_pdb.py

  Log Message:
  -----------
  Adding needed newline


  Commit: b75320ba95e2033f7c12b400c0d587e989667d08
      
https://github.com/pytest-dev/pytest/commit/b75320ba95e2033f7c12b400c0d587e989667d08
  Author: Jeffrey Rackauckas <jeffreyr...@gmail.com>
  Date:   2018-07-02 (Mon, 02 Jul 2018)

  Changed paths:
    M src/_pytest/debugging.py

  Log Message:
  -----------
  Fix --trace option with yield tests.


  Commit: 10a8691ecade7ee3ebbf7223a9873bf83935f473
      
https://github.com/pytest-dev/pytest/commit/10a8691ecade7ee3ebbf7223a9873bf83935f473
  Author: Jeffrey Rackauckas <jeffreyr...@gmail.com>
  Date:   2018-07-02 (Mon, 02 Jul 2018)

  Changed paths:
    M src/_pytest/debugging.py
    M testing/test_pdb.py

  Log Message:
  -----------
  Add support for yielded functions.


  Commit: 6cc4fe2412047dcea25bf2735db5896684680284
      
https://github.com/pytest-dev/pytest/commit/6cc4fe2412047dcea25bf2735db5896684680284
  Author: Jeffrey Rackauckas <jeffreyr...@gmail.com>
  Date:   2018-07-02 (Mon, 02 Jul 2018)

  Changed paths:
    M testing/test_pdb.py

  Log Message:
  -----------
  Fixing bad indentation


  Commit: 2f1a2cf07f521abb6a226d01205a124ae516a334
      
https://github.com/pytest-dev/pytest/commit/2f1a2cf07f521abb6a226d01205a124ae516a334
  Author: Jeffrey Rackauckas <jeffreyr...@gmail.com>
  Date:   2018-07-02 (Mon, 02 Jul 2018)

  Changed paths:
    M testing/test_pdb.py

  Log Message:
  -----------
  Fixing --trace test.


  Commit: 4afb8c428b2541afae9a80983191a351e0edc3dd
      
https://github.com/pytest-dev/pytest/commit/4afb8c428b2541afae9a80983191a351e0edc3dd
  Author: Jeffrey Rackauckas <jeffreyr...@gmail.com>
  Date:   2018-07-02 (Mon, 02 Jul 2018)

  Changed paths:
    M src/_pytest/debugging.py

  Log Message:
  -----------
  Fix python 2 issues


  Commit: 4a925ef5e9334c12ac6ad8b8146dec6d664b9945
      
https://github.com/pytest-dev/pytest/commit/4a925ef5e9334c12ac6ad8b8146dec6d664b9945
  Author: Jeffrey Rackauckas <jeffreyr...@gmail.com>
  Date:   2018-07-02 (Mon, 02 Jul 2018)

  Changed paths:
    M testing/test_pdb.py

  Log Message:
  -----------
  Fixing bug in test.


  Commit: 067de257e140ec4ec716368c69c80f9278743fb7
      
https://github.com/pytest-dev/pytest/commit/067de257e140ec4ec716368c69c80f9278743fb7
  Author: Jeffrey Rackauckas <jeffreyr...@gmail.com>
  Date:   2018-07-02 (Mon, 02 Jul 2018)

  Changed paths:
    M testing/test_pdb.py

  Log Message:
  -----------
  Fix test_pdb.py with pexpect


  Commit: 7696d5371a85147f24b22cf6786b6331827bcc1b
      
https://github.com/pytest-dev/pytest/commit/7696d5371a85147f24b22cf6786b6331827bcc1b
  Author: Bruno Oliveira <nicodde...@gmail.com>
  Date:   2018-07-04 (Wed, 04 Jul 2018)

  Changed paths:
    M CHANGELOG.rst
    M HOWTORELEASE.rst
    R changelog/3061.bugfix.rst
    R changelog/3593.bugfix.rst
    R changelog/3598.trivial.rst
    R changelog/3605.bugfix.rst
    R changelog/3609.trivial.rst
    R changelog/3611.doc.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.6.3.rst
    M doc/en/builtin.rst
    M doc/en/example/simple.rst
    M src/_pytest/logging.py
    M src/_pytest/mark/structures.py
    M src/_pytest/monkeypatch.py
    M testing/logging/test_reporting.py
    M testing/test_mark.py

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


  Commit: 3f5e06ecc465b1befb5e6ad062a264b47bab9f45
      
https://github.com/pytest-dev/pytest/commit/3f5e06ecc465b1befb5e6ad062a264b47bab9f45
  Author: Bruno Oliveira <nicodde...@gmail.com>
  Date:   2018-07-04 (Wed, 04 Jul 2018)

  Changed paths:
    M CHANGELOG.rst
    M HOWTORELEASE.rst
    R changelog/3061.bugfix.rst
    R changelog/3593.bugfix.rst
    R changelog/3598.trivial.rst
    R changelog/3605.bugfix.rst
    R changelog/3609.trivial.rst
    R changelog/3611.doc.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.6.3.rst
    M doc/en/builtin.rst
    M doc/en/example/simple.rst
    M src/_pytest/logging.py
    M src/_pytest/mark/structures.py
    M src/_pytest/monkeypatch.py
    M testing/logging/test_reporting.py
    M testing/test_mark.py

  Log Message:
  -----------
  Merge pull request #3659 from nicoddemus/merge-master-into-features

Merge master into features


  Commit: 3c19370cec606217e36ac136ee19d97185f3a43e
      
https://github.com/pytest-dev/pytest/commit/3c19370cec606217e36ac136ee19d97185f3a43e
  Author: Bruno Oliveira <nicodde...@gmail.com>
  Date:   2018-07-05 (Thu, 05 Jul 2018)

  Changed paths:
    M .gitignore
    A .pre-commit-config.yaml
    M .travis.yml
    M AUTHORS
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M HOWTORELEASE.rst
    M README.rst
    R _pytest/__init__.py
    R _pytest/_argcomplete.py
    R _pytest/_code/__init__.py
    R _pytest/_code/_py2traceback.py
    R _pytest/_code/code.py
    R _pytest/_code/source.py
    R _pytest/assertion/__init__.py
    R _pytest/assertion/rewrite.py
    R _pytest/assertion/truncate.py
    R _pytest/assertion/util.py
    R _pytest/cacheprovider.py
    R _pytest/capture.py
    R _pytest/compat.py
    R _pytest/config.py
    R _pytest/debugging.py
    R _pytest/deprecated.py
    R _pytest/doctest.py
    R _pytest/fixtures.py
    R _pytest/freeze_support.py
    R _pytest/helpconfig.py
    R _pytest/hookspec.py
    R _pytest/junitxml.py
    R _pytest/logging.py
    R _pytest/main.py
    R _pytest/mark/__init__.py
    R _pytest/mark/evaluate.py
    R _pytest/mark/legacy.py
    R _pytest/mark/structures.py
    R _pytest/monkeypatch.py
    R _pytest/nodes.py
    R _pytest/nose.py
    R _pytest/outcomes.py
    R _pytest/pastebin.py
    R _pytest/pytester.py
    R _pytest/python.py
    R _pytest/python_api.py
    R _pytest/recwarn.py
    R _pytest/resultlog.py
    R _pytest/runner.py
    R _pytest/setuponly.py
    R _pytest/setupplan.py
    R _pytest/skipping.py
    R _pytest/terminal.py
    R _pytest/tmpdir.py
    R _pytest/unittest.py
    R _pytest/warnings.py
    M appveyor.yml
    M bench/bench.py
    M bench/bench_argcomplete.py
    M bench/empty.py
    M bench/manyparam.py
    M bench/skip.py
    A changelog/2220.bugfix.rst
    R changelog/2334.feature
    R changelog/3008.bugfix.rst
    R changelog/3008.trivial.rst
    R changelog/3180.feature.rst
    R changelog/3290.feature
    R changelog/3307.feature.rst
    R changelog/3317.feature
    A changelog/3519.trivial.rst
    A changelog/3576.feature.rst
    A changelog/3579.feature.rst
    A changelog/3623.feature.rst
    M changelog/README.rst
    M doc/en/_templates/links.html
    M doc/en/_themes/flask/theme.conf
    M doc/en/_themes/flask_theme_support.py
    M doc/en/announce/index.rst
    M doc/en/announce/release-2.0.3.rst
    M doc/en/announce/release-2.1.1.rst
    M doc/en/announce/release-2.1.2.rst
    M doc/en/announce/release-2.1.3.rst
    M doc/en/announce/release-2.2.1.rst
    M doc/en/announce/release-2.2.2.rst
    M doc/en/announce/release-2.2.4.rst
    M doc/en/announce/release-2.3.0.rst
    M doc/en/announce/release-2.3.1.rst
    M doc/en/announce/release-2.3.2.rst
    M doc/en/announce/release-2.3.3.rst
    M doc/en/announce/release-2.3.4.rst
    M doc/en/announce/release-2.3.5.rst
    M doc/en/announce/release-2.4.0.rst
    M doc/en/announce/release-2.4.1.rst
    M doc/en/announce/release-2.4.2.rst
    M doc/en/announce/release-2.5.0.rst
    M doc/en/announce/release-2.5.1.rst
    M doc/en/announce/release-2.5.2.rst
    M doc/en/announce/release-2.6.1.rst
    M doc/en/announce/release-2.6.2.rst
    M doc/en/announce/release-2.6.3.rst
    M doc/en/announce/release-2.7.0.rst
    M doc/en/announce/release-2.7.2.rst
    M doc/en/announce/release-2.8.3.rst
    M doc/en/announce/release-2.8.7.rst
    M doc/en/announce/release-2.9.0.rst
    M doc/en/announce/release-2.9.1.rst
    M doc/en/announce/release-3.0.0.rst
    M doc/en/announce/release-3.0.1.rst
    M doc/en/announce/release-3.0.2.rst
    M doc/en/announce/release-3.0.3.rst
    M doc/en/announce/release-3.0.4.rst
    M doc/en/announce/release-3.0.5.rst
    M doc/en/announce/release-3.0.6.rst
    M doc/en/announce/release-3.0.7.rst
    M doc/en/announce/release-3.1.1.rst
    M doc/en/announce/release-3.1.2.rst
    M doc/en/announce/release-3.1.3.rst
    M doc/en/announce/release-3.2.1.rst
    M doc/en/announce/release-3.2.2.rst
    M doc/en/announce/release-3.2.3.rst
    M doc/en/announce/release-3.2.4.rst
    M doc/en/announce/release-3.2.5.rst
    M doc/en/announce/release-3.3.1.rst
    M doc/en/announce/release-3.3.2.rst
    M doc/en/announce/release-3.4.1.rst
    M doc/en/announce/release-3.4.2.rst
    M doc/en/announce/release-3.5.1.rst
    A doc/en/announce/release-3.6.0.rst
    A doc/en/announce/release-3.6.1.rst
    A doc/en/announce/release-3.6.2.rst
    A doc/en/announce/release-3.6.3.rst
    M doc/en/assert.rst
    M doc/en/bash-completion.rst
    M doc/en/builtin.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    R doc/en/check_sphinx.py
    M doc/en/conf.py
    M doc/en/contact.rst
    M doc/en/contents.rst
    M doc/en/customize.rst
    M doc/en/development_guide.rst
    M doc/en/doctest.rst
    M doc/en/example/assertion/failure_demo.py
    M doc/en/example/assertion/global_testmodule_config/conftest.py
    M doc/en/example/assertion/global_testmodule_config/test_hello_world.py
    M doc/en/example/assertion/test_failures.py
    M doc/en/example/assertion/test_setup_flow_example.py
    M doc/en/example/attic.rst
    M doc/en/example/costlysetup/conftest.py
    M doc/en/example/costlysetup/sub_a/test_quick.py
    M doc/en/example/costlysetup/sub_b/test_two.py
    M doc/en/example/markers.rst
    M doc/en/example/multipython.py
    M doc/en/example/nonpython.rst
    M doc/en/example/nonpython/conftest.py
    M doc/en/example/parametrize.rst
    M doc/en/example/py2py3/conftest.py
    M doc/en/example/py2py3/test_py2.py
    M doc/en/example/py2py3/test_py3.py
    M doc/en/example/pythoncollection.py
    M doc/en/example/pythoncollection.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/example/xfail_demo.py
    M doc/en/faq.rst
    M doc/en/fixture.rst
    M doc/en/funcarg_compare.rst
    M doc/en/funcargs.rst
    R doc/en/genapi.py
    M doc/en/getting-started.rst
    M doc/en/goodpractices.rst
    M doc/en/index.rst
    M doc/en/links.inc
    M doc/en/logging.rst
    M doc/en/mark.rst
    M doc/en/monkeypatch.rst
    M doc/en/nose.rst
    M doc/en/parametrize.rst
    M doc/en/plugins.rst
    M doc/en/projects.rst
    M doc/en/proposals/parametrize_with_fixtures.rst
    M doc/en/reference.rst
    M doc/en/skipping.rst
    M doc/en/talks.rst
    R doc/en/test/attic.rst
    R doc/en/test/config.html
    R doc/en/test/dist.html
    R doc/en/test/extend.html
    R doc/en/test/index.rst
    R doc/en/test/mission.rst
    R doc/en/test/plugin/cov.rst
    R doc/en/test/plugin/coverage.rst
    R doc/en/test/plugin/django.rst
    R doc/en/test/plugin/figleaf.rst
    R doc/en/test/plugin/helpconfig.rst
    R doc/en/test/plugin/index.rst
    R doc/en/test/plugin/links.rst
    R doc/en/test/plugin/nose.rst
    R doc/en/test/plugin/oejskit.rst
    R doc/en/test/plugin/terminal.rst
    R doc/en/test/plugin/xdist.rst
    R doc/en/test/test.html
    M doc/en/tmpdir.rst
    M doc/en/unittest.rst
    M doc/en/usage.rst
    M doc/en/warnings.rst
    M doc/en/writing_plugins.rst
    M doc/en/xunit_setup.rst
    M extra/get_issues.py
    M pyproject.toml
    R pytest.py
    R scripts/check-rst.py
    M setup.py
    A src/_pytest/__init__.py
    A src/_pytest/_argcomplete.py
    A src/_pytest/_code/__init__.py
    A src/_pytest/_code/_py2traceback.py
    A src/_pytest/_code/code.py
    A src/_pytest/_code/source.py
    A src/_pytest/assertion/__init__.py
    A src/_pytest/assertion/rewrite.py
    A src/_pytest/assertion/truncate.py
    A src/_pytest/assertion/util.py
    A src/_pytest/cacheprovider.py
    A src/_pytest/capture.py
    A src/_pytest/compat.py
    A src/_pytest/config/__init__.py
    A src/_pytest/config/argparsing.py
    A src/_pytest/config/exceptions.py
    A src/_pytest/config/findpaths.py
    A src/_pytest/debugging.py
    A src/_pytest/deprecated.py
    A src/_pytest/doctest.py
    A src/_pytest/experiments.py
    A src/_pytest/fixtures.py
    A src/_pytest/freeze_support.py
    A src/_pytest/helpconfig.py
    A src/_pytest/hookspec.py
    A src/_pytest/junitxml.py
    A src/_pytest/logging.py
    A src/_pytest/main.py
    A src/_pytest/mark/__init__.py
    A src/_pytest/mark/evaluate.py
    A src/_pytest/mark/legacy.py
    A src/_pytest/mark/structures.py
    A src/_pytest/monkeypatch.py
    A src/_pytest/nodes.py
    A src/_pytest/nose.py
    A src/_pytest/outcomes.py
    A src/_pytest/pastebin.py
    A src/_pytest/paths.py
    A src/_pytest/pytester.py
    A src/_pytest/python.py
    A src/_pytest/python_api.py
    A src/_pytest/recwarn.py
    A src/_pytest/reports.py
    A src/_pytest/resultlog.py
    A src/_pytest/runner.py
    A src/_pytest/setuponly.py
    A src/_pytest/setupplan.py
    A src/_pytest/skipping.py
    A src/_pytest/terminal.py
    A src/_pytest/tmpdir.py
    A src/_pytest/unittest.py
    A src/_pytest/warnings.py
    A src/pytest.py
    M tasks/__init__.py
    M tasks/generate.py
    M tasks/release.minor.rst
    M tasks/release.patch.rst
    M tasks/requirements.txt
    M testing/acceptance_test.py
    M testing/code/test_code.py
    M testing/code/test_excinfo.py
    M testing/code/test_source.py
    M testing/code/test_source_multiline_block.py
    M testing/deprecated_test.py
    A testing/example_scripts/README.rst
    A testing/example_scripts/conftest_usageerror/conftest.py
    A testing/example_scripts/issue88_initial_file_multinodes/conftest.py
    A testing/example_scripts/issue88_initial_file_multinodes/test_hello.py
    A testing/example_scripts/issue_519.py
    A testing/examples/test_issue519.py
    M testing/freeze/.gitignore
    M testing/freeze/create_executable.py
    M testing/freeze/runtests_script.py
    M testing/freeze/tests/test_trivial.py
    M testing/freeze/tox_run.py
    M testing/logging/test_fixture.py
    M testing/logging/test_formatter.py
    M testing/logging/test_reporting.py
    M testing/python/approx.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/integration.py
    M testing/python/metafunc.py
    M testing/python/raises.py
    M testing/python/setup_only.py
    M testing/python/setup_plan.py
    M testing/python/show_fixtures_per_test.py
    M testing/python/test_deprecations.py
    M testing/test_argcomplete.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_cacheprovider.py
    M testing/test_capture.py
    M testing/test_collection.py
    M testing/test_compat.py
    M testing/test_config.py
    M testing/test_conftest.py
    M testing/test_doctest.py
    M testing/test_entry_points.py
    M testing/test_helpconfig.py
    M testing/test_junitxml.py
    M testing/test_mark.py
    M testing/test_modimport.py
    M testing/test_monkeypatch.py
    M testing/test_nodes.py
    M testing/test_nose.py
    M testing/test_parseopt.py
    M testing/test_pastebin.py
    M testing/test_pdb.py
    M testing/test_pluginmanager.py
    M testing/test_pytester.py
    M testing/test_recwarn.py
    M testing/test_resultlog.py
    M testing/test_runner.py
    M testing/test_runner_xunit.py
    M testing/test_session.py
    M testing/test_skipping.py
    M testing/test_terminal.py
    M testing/test_tmpdir.py
    M testing/test_unittest.py
    M testing/test_warnings.py
    M tox.ini

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


  Commit: 027d2336b8d6de145e14a0eaaedacd04dca21c08
      
https://github.com/pytest-dev/pytest/commit/027d2336b8d6de145e14a0eaaedacd04dca21c08
  Author: Bruno Oliveira <nicodde...@gmail.com>
  Date:   2018-07-05 (Thu, 05 Jul 2018)

  Changed paths:
    M changelog/2283.feature
    M doc/en/fixture.rst
    M src/_pytest/fixtures.py

  Log Message:
  -----------
  Add minimal docs for package-scoped fixtures (experimental)


  Commit: 1e94ac784f1fb5e439d8796ec86f7a95a03df364
      
https://github.com/pytest-dev/pytest/commit/1e94ac784f1fb5e439d8796ec86f7a95a03df364
  Author: Ronny Pfannschmidt <opensou...@ronnypfannschmidt.de>
  Date:   2018-07-06 (Fri, 06 Jul 2018)

  Changed paths:
    M AUTHORS
    A changelog/2283.feature
    M doc/en/fixture.rst
    M src/_pytest/fixtures.py
    M src/_pytest/main.py
    M src/_pytest/nodes.py
    M src/_pytest/python.py
    M src/pytest.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/test_collection.py

  Log Message:
  -----------
  Merge pull request #3389 from jonozzz/features

Add package scoped fixtures #2283


  Commit: 303133f013ea8408d76b8041e955faebb46e004e
      
https://github.com/pytest-dev/pytest/commit/303133f013ea8408d76b8041e955faebb46e004e
  Author: Bruno Oliveira <nicodde...@gmail.com>
  Date:   2018-07-07 (Sat, 07 Jul 2018)

  Changed paths:
    A changelog/3610.feature.rst
    M doc/en/usage.rst
    M src/_pytest/debugging.py
    M testing/test_pdb.py

  Log Message:
  -----------
  Merge pull request #3647 from jeffreyrack/3610-add-trace-option

3610 add trace option


  Commit: a522fc745af6c8a62de613c621cf0bda402d8df0
      
https://github.com/pytest-dev/pytest/commit/a522fc745af6c8a62de613c621cf0bda402d8df0
  Author: Bruno Oliveira <nicodde...@gmail.com>
  Date:   2018-07-07 (Sat, 07 Jul 2018)

  Changed paths:
    M changelog/2220.bugfix.rst
    M changelog/3576.feature.rst
    M changelog/3610.feature.rst
    M changelog/3623.feature.rst

  Log Message:
  -----------
  Small tweaks to the changelog entries


  Commit: 1cd62f8c3803e54d57be5555d6cd0a625c489353
      
https://github.com/pytest-dev/pytest/commit/1cd62f8c3803e54d57be5555d6cd0a625c489353
  Author: Bruno Oliveira <nicodde...@gmail.com>
  Date:   2018-07-07 (Sat, 07 Jul 2018)

  Changed paths:
    M changelog/_template.rst

  Log Message:
  -----------
  Update CHANGELOG template to put issue links at the start of entries

This allows us to use the new multi-line entries available with
towncrier 18.6.0


  Commit: 05f1d0d3efb8f4c08085bb4a8241a72e7e5ede48
      
https://github.com/pytest-dev/pytest/commit/05f1d0d3efb8f4c08085bb4a8241a72e7e5ede48
  Author: Bruno Oliveira <nicodde...@gmail.com>
  Date:   2018-07-07 (Sat, 07 Jul 2018)

  Changed paths:
    M changelog/README.rst

  Log Message:
  -----------
  Update README for CHANGELOG about using multiple paragraphs


  Commit: 803302e70c4f1393bee7595d945802071d92723a
      
https://github.com/pytest-dev/pytest/commit/803302e70c4f1393bee7595d945802071d92723a
  Author: Bruno Oliveira <nicodde...@gmail.com>
  Date:   2018-07-07 (Sat, 07 Jul 2018)

  Changed paths:
    M changelog/2220.bugfix.rst

  Log Message:
  -----------
  Fix end-of-line in 2220.bugfix.rst


  Commit: 5226c7fac3aea5b9b5d7ee01a7adfd6ce4e59291
      
https://github.com/pytest-dev/pytest/commit/5226c7fac3aea5b9b5d7ee01a7adfd6ce4e59291
  Author: Bruno Oliveira <nicodde...@gmail.com>
  Date:   2018-07-10 (Tue, 10 Jul 2018)

  Changed paths:
    M changelog/2220.bugfix.rst
    M changelog/3576.feature.rst
    M changelog/3610.feature.rst
    M changelog/3623.feature.rst
    M changelog/README.rst
    M changelog/_template.rst

  Log Message:
  -----------
  Merge pull request #3665 from nicoddemus/changelog-tweaks

Small tweaks to the changelog entries


  Commit: f6ceedd15b0347ab1c0d40daba2dac70bc58733e
      
https://github.com/pytest-dev/pytest/commit/f6ceedd15b0347ab1c0d40daba2dac70bc58733e
  Author: Bruno Oliveira <nicodde...@gmail.com>
  Date:   2018-07-11 (Wed, 11 Jul 2018)

  Changed paths:
    M src/_pytest/pytester.py
    A 
testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub1/__init__.py
    A 
testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub1/conftest.py
    A 
testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub1/test_in_sub1.py
    A 
testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub2/__init__.py
    A 
testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub2/conftest.py
    A 
testing/example_scripts/fixtures/fill_fixtures/test_conftest_funcargs_only_available_in_subdir/sub2/test_in_sub2.py
    A 
testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/conftest.py
    A 
testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/pkg/__init__.py
    A 
testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/pkg/conftest.py
    A 
testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_conftest/pkg/test_spam.py
    A 
testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_module/conftest.py
    A 
testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_conftest_module/test_extend_fixture_conftest_module.py
    A 
testing/example_scripts/fixtures/fill_fixtures/test_extend_fixture_module_class.py
    A testing/example_scripts/fixtures/fill_fixtures/test_funcarg_basic.py
    A 
testing/example_scripts/fixtures/fill_fixtures/test_funcarg_lookup_classlevel.py
    A 
testing/example_scripts/fixtures/fill_fixtures/test_funcarg_lookup_modulelevel.py
    A testing/example_scripts/fixtures/fill_fixtures/test_funcarg_lookupfails.py
    M testing/python/fixture.py

  Log Message:
  -----------
  Merge pull request #3636 from RonnyPfannschmidt/fixturetest-examples

[RFC] Fixturetest examples - move test contents to use example scripts for 
contents


  Commit: d2fe6191201139570501bdd8d213b05b6aeba732
      
https://github.com/pytest-dev/pytest/commit/d2fe6191201139570501bdd8d213b05b6aeba732
  Author: Tadek Teleżyński <tade...@gmail.com>
  Date:   2018-07-15 (Sun, 15 Jul 2018)

  Changed paths:
    M AUTHORS
    A changelog/980.bugfix.rst
    M src/_pytest/_code/code.py
    M src/_pytest/nodes.py
    M testing/code/test_excinfo.py

  Log Message:
  -----------
  Fix truncated locals in verbose mode


  Commit: ac9ceaacd8949d29b48f5f66319385854f12be8a
      
https://github.com/pytest-dev/pytest/commit/ac9ceaacd8949d29b48f5f66319385854f12be8a
  Author: Bruno Oliveira <nicodde...@gmail.com>
  Date:   2018-07-15 (Sun, 15 Jul 2018)

  Changed paths:
    A .github/labels.toml
    M .pre-commit-config.yaml
    M .travis.yml
    M CHANGELOG.rst
    A CITATION
    M HOWTORELEASE.rst
    M README.rst
    A changelog/2319.trivial.rst
    A changelog/3402.trivial.rst
    A changelog/3592.doc.rst
    A changelog/3635.trivial.rst
    A changelog/742.bugfix.rst
    M doc/en/announce/release-2.9.0.rst
    M doc/en/development_guide.rst
    M doc/en/example/markers.rst
    M doc/en/fixture.rst
    M doc/en/goodpractices.rst
    M doc/en/mark.rst
    M doc/en/reference.rst
    A scripts/release.minor.rst
    A scripts/release.patch.rst
    A scripts/release.py
    M src/_pytest/_code/source.py
    M src/_pytest/compat.py
    M src/_pytest/config/__init__.py
    M src/_pytest/mark/structures.py
    M src/_pytest/pytester.py
    M src/_pytest/python.py
    R tasks/__init__.py
    R tasks/generate.py
    R tasks/release.minor.rst
    R tasks/release.patch.rst
    R tasks/requirements.txt
    M testing/code/test_source.py
    R testing/code/test_source_multiline_block.py
    M testing/python/raises.py
    M testing/test_assertrewrite.py
    M testing/test_capture.py
    M testing/test_pytester.py
    M tox.ini

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


  Commit: db33f03c15fffbdd5a5268112390a8488fe142d6
      
https://github.com/pytest-dev/pytest/commit/db33f03c15fffbdd5a5268112390a8488fe142d6
  Author: Bruno Oliveira <nicodde...@gmail.com>
  Date:   2018-07-15 (Sun, 15 Jul 2018)

  Changed paths:
    M AUTHORS
    A changelog/980.bugfix.rst
    M src/_pytest/_code/code.py
    M src/_pytest/nodes.py
    M testing/code/test_excinfo.py

  Log Message:
  -----------
  Merge pull request #3681 from tadeoos/980-fix-truncated-locals-in-verbose

Fix truncated locals in verbose mode


  Commit: 0bb29d56492258a751a964e4ba729da1f7f52802
      
https://github.com/pytest-dev/pytest/commit/0bb29d56492258a751a964e4ba729da1f7f52802
  Author: Bruno Oliveira <nicodde...@gmail.com>
  Date:   2018-07-15 (Sun, 15 Jul 2018)

  Changed paths:
    A .github/labels.toml
    M .pre-commit-config.yaml
    M .travis.yml
    M CHANGELOG.rst
    A CITATION
    M HOWTORELEASE.rst
    M README.rst
    A changelog/2319.trivial.rst
    A changelog/3402.trivial.rst
    A changelog/3592.doc.rst
    A changelog/3635.trivial.rst
    A changelog/742.bugfix.rst
    M doc/en/announce/release-2.9.0.rst
    M doc/en/development_guide.rst
    M doc/en/example/markers.rst
    M doc/en/fixture.rst
    M doc/en/goodpractices.rst
    M doc/en/mark.rst
    M doc/en/reference.rst
    A scripts/release.minor.rst
    A scripts/release.patch.rst
    A scripts/release.py
    M src/_pytest/_code/source.py
    M src/_pytest/compat.py
    M src/_pytest/config/__init__.py
    M src/_pytest/mark/structures.py
    M src/_pytest/pytester.py
    M src/_pytest/python.py
    R tasks/__init__.py
    R tasks/generate.py
    R tasks/release.minor.rst
    R tasks/release.patch.rst
    R tasks/requirements.txt
    M testing/code/test_source.py
    R testing/code/test_source_multiline_block.py
    M testing/python/raises.py
    M testing/test_assertrewrite.py
    M testing/test_capture.py
    M testing/test_pytester.py
    M tox.ini

  Log Message:
  -----------
  Merge pull request #3685 from nicoddemus/merge-master-into-features

Merge master into features


  Commit: 516793339589b9278eb99da68dd21f4d9b2ab2c8
      
https://github.com/pytest-dev/pytest/commit/516793339589b9278eb99da68dd21f4d9b2ab2c8
  Author: Bruno Oliveira <nicodde...@gmail.com>
  Date:   2018-07-22 (Sun, 22 Jul 2018)

  Changed paths:
    M src/_pytest/fixtures.py

  Log Message:
  -----------
  Move teardown code of yield fixtures to a partial to avoid leaks

As it were before, it was keeping a reference to fixturefunc and it
alive when an error occurred


  Commit: c9a088130947dfb8453bbd0ccec6bd1de219fa18
      
https://github.com/pytest-dev/pytest/commit/c9a088130947dfb8453bbd0ccec6bd1de219fa18
  Author: Bruno Oliveira <nicodde...@gmail.com>
  Date:   2018-07-22 (Sun, 22 Jul 2018)

  Changed paths:
    M src/_pytest/fixtures.py

  Log Message:
  -----------
  Isolate the code that resolves the fixturefunc to a separate function

pytest_fixture_setup was somewhat convoluted because it was trying
to do too many things.


  Commit: f5165064eedf852898ff0418f40e404a9b1eda19
      
https://github.com/pytest-dev/pytest/commit/f5165064eedf852898ff0418f40e404a9b1eda19
  Author: Bruno Oliveira <nicodde...@gmail.com>
  Date:   2018-07-22 (Sun, 22 Jul 2018)

  Changed paths:
    M src/_pytest/fixtures.py

  Log Message:
  -----------
  Make yield_fixture just call fixture to do its work

Since fixture and yield_fixture are identical, they should call
the same code; as it was, the code inside them was already starting
to deviate.


  Commit: f8749eeb5c56cd967311965ee0d265fc74870603
      
https://github.com/pytest-dev/pytest/commit/f8749eeb5c56cd967311965ee0d265fc74870603
  Author: Ronny Pfannschmidt <opensou...@ronnypfannschmidt.de>
  Date:   2018-07-23 (Mon, 23 Jul 2018)

  Changed paths:
    M src/_pytest/fixtures.py

  Log Message:
  -----------
  Merge pull request #3708 from nicoddemus/small-refactors

Small refactorings


  Commit: 011f88f7e77b8b2e6de01d2c5588dda47c77093b
      
https://github.com/pytest-dev/pytest/commit/011f88f7e77b8b2e6de01d2c5588dda47c77093b
  Author: Bruno Oliveira <nicodde...@gmail.com>
  Date:   2018-07-26 (Thu, 26 Jul 2018)

  Changed paths:
    A changelog/3661.removal.rst
    M src/_pytest/compat.py
    M src/_pytest/deprecated.py
    M src/_pytest/fixtures.py
    M src/_pytest/pytester.py
    M testing/deprecated_test.py
    A testing/example_scripts/tmpdir/tmpdir_fixture.py
    M testing/python/fixture.py
    M testing/test_assertion.py
    M testing/test_conftest.py
    M testing/test_tmpdir.py

  Log Message:
  -----------
  Deprecate calling fixture functions directly

This will now issue a RemovedInPytest4Warning when the user calls
a fixture function directly, instead of requesting it from test
functions as is expected

Fix #3661


  Commit: 6e57d123bb240e4b3668fc4e422a6e0f01d08f17
      
https://github.com/pytest-dev/pytest/commit/6e57d123bb240e4b3668fc4e422a6e0f01d08f17
  Author: Bruno Oliveira <nicodde...@gmail.com>
  Date:   2018-07-26 (Thu, 26 Jul 2018)

  Changed paths:
    M testing/python/metafunc.py

  Log Message:
  -----------
  Mark test_idval_hypothesis as flaky on Windows (#3707)


  Commit: 57b0c60cb4a083592cce04e8b383b55bf14a59dc
      
https://github.com/pytest-dev/pytest/commit/57b0c60cb4a083592cce04e8b383b55bf14a59dc
  Author: Bruno Oliveira <nicodde...@gmail.com>
  Date:   2018-07-26 (Thu, 26 Jul 2018)

  Changed paths:
    M src/_pytest/pytester.py
    M testing/test_tmpdir.py

  Log Message:
  -----------
  Remove Testdir.run_example as recommended


  Commit: fe16f81da14ba12a9eab5d84e17c989a2a67ba8f
      
https://github.com/pytest-dev/pytest/commit/fe16f81da14ba12a9eab5d84e17c989a2a67ba8f
  Author: Bruno Oliveira <nicodde...@gmail.com>
  Date:   2018-07-27 (Fri, 27 Jul 2018)

  Changed paths:
    A changelog/3661.removal.rst
    M src/_pytest/compat.py
    M src/_pytest/deprecated.py
    M src/_pytest/fixtures.py
    M testing/deprecated_test.py
    A testing/example_scripts/tmpdir/tmpdir_fixture.py
    M testing/python/fixture.py
    M testing/python/metafunc.py
    M testing/test_assertion.py
    M testing/test_conftest.py
    M testing/test_tmpdir.py

  Log Message:
  -----------
  Merge pull request #3705 from nicoddemus/deprecate-call-fixture-func

 Deprecate calling fixture functions directly


  Commit: 0e475995720b846db91d02384b61ad8a54e9229d
      
https://github.com/pytest-dev/pytest/commit/0e475995720b846db91d02384b61ad8a54e9229d
  Author: Bruno Oliveira <nicodde...@gmail.com>
  Date:   2018-07-29 (Sun, 29 Jul 2018)

  Changed paths:
    M .pre-commit-config.yaml
    M CHANGELOG.rst
    R changelog/2319.trivial.rst
    R changelog/3402.trivial.rst
    R changelog/3592.doc.rst
    R changelog/3635.trivial.rst
    R changelog/742.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.6.4.rst
    M doc/en/conf.py
    M doc/en/customize.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/simple.rst
    M doc/en/fixture.rst
    M doc/en/mark.rst
    M doc/en/reference.rst
    M pyproject.toml
    M setup.py

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


  Commit: e3d412d1f4d873bce356055e8c736a1220bed6bb
      
https://github.com/pytest-dev/pytest/commit/e3d412d1f4d873bce356055e8c736a1220bed6bb
  Author: Bruno Oliveira <nicodde...@gmail.com>
  Date:   2018-07-29 (Sun, 29 Jul 2018)

  Changed paths:
    A changelog/2639.removal.rst
    M setup.py
    M src/_pytest/hookspec.py

  Log Message:
  -----------
  Warn when implementations exist for pytest_namespace hook

This hook has been deprecated and will be removed in the future.

Fix #2639


  Commit: 8af78f417f19c247df99fc235cc73e1ec5a1ba0e
      
https://github.com/pytest-dev/pytest/commit/8af78f417f19c247df99fc235cc73e1ec5a1ba0e
  Author: Bruno Oliveira <nicodde...@gmail.com>
  Date:   2018-07-30 (Mon, 30 Jul 2018)

  Changed paths:
    M .pre-commit-config.yaml
    M CHANGELOG.rst
    R changelog/2319.trivial.rst
    R changelog/3402.trivial.rst
    R changelog/3592.doc.rst
    R changelog/3635.trivial.rst
    R changelog/742.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.6.4.rst
    M doc/en/conf.py
    M doc/en/customize.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/simple.rst
    M doc/en/fixture.rst
    M doc/en/mark.rst
    M doc/en/reference.rst
    M pyproject.toml
    M setup.py

  Log Message:
  -----------
  Merge pull request #3732 from nicoddemus/merge-master-into-features

Merge master into features


  Commit: cf6d8e7e53f6fa4544e12d60b270c172a2e01ecf
      
https://github.com/pytest-dev/pytest/commit/cf6d8e7e53f6fa4544e12d60b270c172a2e01ecf
  Author: Bruno Oliveira <nicodde...@gmail.com>
  Date:   2018-07-30 (Mon, 30 Jul 2018)

  Changed paths:
    M src/_pytest/hookspec.py
    M testing/test_pluginmanager.py

  Log Message:
  -----------
  Fix test and update warning in pytest_namespace docs


  Commit: 953a618102782daceb229af3b8788b71560b1f0d
      
https://github.com/pytest-dev/pytest/commit/953a618102782daceb229af3b8788b71560b1f0d
  Author: Bruno Oliveira <nicodde...@gmail.com>
  Date:   2018-07-30 (Mon, 30 Jul 2018)

  Changed paths:
    M changelog/2639.removal.rst

  Log Message:
  -----------
  Update CHANGELOG entry about pytest_namespace deprecation


  Commit: 8609f8d25a1f9a59df835bf51bdf86953c127f00
      
https://github.com/pytest-dev/pytest/commit/8609f8d25a1f9a59df835bf51bdf86953c127f00
  Author: Bruno Oliveira <nicodde...@gmail.com>
  Date:   2018-07-30 (Mon, 30 Jul 2018)

  Changed paths:
    M src/_pytest/deprecated.py
    M src/_pytest/hookspec.py

  Log Message:
  -----------
  Move warning definition to deprecated module


  Commit: 9f5d73d44afc165a0c0803913615f3ddd119d2b3
      
https://github.com/pytest-dev/pytest/commit/9f5d73d44afc165a0c0803913615f3ddd119d2b3
  Author: Ronny Pfannschmidt <opensou...@ronnypfannschmidt.de>
  Date:   2018-07-30 (Mon, 30 Jul 2018)

  Changed paths:
    A changelog/2639.removal.rst
    M setup.py
    M src/_pytest/deprecated.py
    M src/_pytest/hookspec.py
    M testing/test_pluginmanager.py

  Log Message:
  -----------
  Merge pull request #3735 from nicoddemus/deprecate-pytest-namespace

Deprecate pytest namespace


  Commit: eada0b1fd7a892be9c8e32cac7b3af26b919056d
      
https://github.com/pytest-dev/pytest/commit/eada0b1fd7a892be9c8e32cac7b3af26b919056d
  Author: Bruno Oliveira <nicodde...@gmail.com>
  Date:   2018-07-30 (Mon, 30 Jul 2018)

  Changed paths:
    M .travis.yml
    M appveyor.yml
    A changelog/3295.doc.rst
    A changelog/3695.bugfix.rst
    M doc/en/cache.rst
    M src/_pytest/python_api.py
    M testing/python/approx.py

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


  Commit: d461e931dd7fa7eae7b835cb84047e033872aade
      
https://github.com/pytest-dev/pytest/commit/d461e931dd7fa7eae7b835cb84047e033872aade
  Author: Bruno Oliveira <nicodde...@gmail.com>
  Date:   2018-07-30 (Mon, 30 Jul 2018)

  Changed paths:
    M tox.ini

  Log Message:
  -----------
  Use python 3.6 for regendoc


  Commit: 2c09930b6d701d91a0284c6d44086488ffbcb419
      
https://github.com/pytest-dev/pytest/commit/2c09930b6d701d91a0284c6d44086488ffbcb419
  Author: Bruno Oliveira <nicodde...@gmail.com>
  Date:   2018-07-30 (Mon, 30 Jul 2018)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Use proper quotes for python 3.7 on travis.yml


  Commit: 60b1913ba21094da5eb91d8c68642c38f20f6a26
      
https://github.com/pytest-dev/pytest/commit/60b1913ba21094da5eb91d8c68642c38f20f6a26
  Author: Bruno Oliveira <nicodde...@gmail.com>
  Date:   2018-07-30 (Mon, 30 Jul 2018)

  Changed paths:
    M CHANGELOG.rst
    R changelog/2220.bugfix.rst
    R changelog/2283.feature
    R changelog/2639.removal.rst
    R changelog/3295.doc.rst
    R changelog/3519.trivial.rst
    R changelog/3576.feature.rst
    R changelog/3579.feature.rst
    R changelog/3610.feature.rst
    R changelog/3623.feature.rst
    R changelog/3661.removal.rst
    R changelog/3695.bugfix.rst
    R changelog/980.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.7.0.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/fixture.rst
    M doc/en/getting-started.rst

  Log Message:
  -----------
  Preparing release version 3.7.0


  Commit: 997ef593068a36c283cbb83d938272b9770caa36
      
https://github.com/pytest-dev/pytest/commit/997ef593068a36c283cbb83d938272b9770caa36
  Author: Bruno Oliveira <nicodde...@gmail.com>
  Date:   2018-07-30 (Mon, 30 Jul 2018)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Fix typos in CHANGELOG


  Commit: 253419316ce09b952862811db229a9e9383a332b
      
https://github.com/pytest-dev/pytest/commit/253419316ce09b952862811db229a9e9383a332b
  Author: Bruno Oliveira <nicodde...@gmail.com>
  Date:   2018-07-30 (Mon, 30 Jul 2018)

  Changed paths:
    M .travis.yml
    M CHANGELOG.rst
    M appveyor.yml
    R changelog/2220.bugfix.rst
    R changelog/2283.feature
    R changelog/2639.removal.rst
    R changelog/3519.trivial.rst
    R changelog/3576.feature.rst
    R changelog/3579.feature.rst
    R changelog/3610.feature.rst
    R changelog/3623.feature.rst
    R changelog/3661.removal.rst
    R changelog/980.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.7.0.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/fixture.rst
    M doc/en/getting-started.rst
    M src/_pytest/python_api.py
    M testing/python/approx.py
    M tox.ini

  Log Message:
  -----------
  Merge pull request #3738 from nicoddemus/release-3.7.0

Release 3.7.0


Compare: 
https://github.com/pytest-dev/pytest/compare/150535b6c11b...253419316ce0
      **NOTE:** This service has been marked for deprecation: 
https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.
_______________________________________________
pytest-commit mailing list
pytest-commit@python.org
https://mail.python.org/mailman/listinfo/pytest-commit

Reply via email to