From nicoddemus at gmail.com  Thu Apr  6 17:03:35 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 06 Apr 2017 14:03:35 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] bc18bc: Pin sphinx to 1.4 when
 generating docs to workarou...
Message-ID: <58e6ad2740885_78a53f8f1304dc24960f1@hookshot-fe6-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/fix-search-docs
  Home:   https://github.com/pytest-dev/pytest
  Commit: bc18bc87c2495b1097be938f76b002a5efc98aa8
      https://github.com/pytest-dev/pytest/commit/bc18bc87c2495b1097be938f76b002a5efc98aa8
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-04-06 (Thu, 06 Apr 2017)

  Changed paths:
    A doc/en/requirements.txt

  Log Message:
  -----------
  Pin sphinx to 1.4 when generating docs to workaround search issues on RTD



From nicoddemus at gmail.com  Thu Apr  6 17:09:18 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 06 Apr 2017 14:09:18 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 44a3db: Pin sphinx to 1.4 when
 generating docs to workarou...
Message-ID: <58e6ae7edd574_1ac813fb05ce71c3c218327@hookshot-fe-6dbb0c4.cp1-iad.github.net.mail>

  Branch: refs/heads/fix-search-docs
  Home:   https://github.com/pytest-dev/pytest
  Commit: 44a3db3dc668b28fa3892b3cd9fb2e14aa2d7c21
      https://github.com/pytest-dev/pytest/commit/44a3db3dc668b28fa3892b3cd9fb2e14aa2d7c21
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-04-06 (Thu, 06 Apr 2017)

  Changed paths:
    A doc/en/requirements.txt

  Log Message:
  -----------
  Pin sphinx to 1.4 when generating docs to workaround search issues on RTD

Fix #2302



From nicoddemus at gmail.com  Thu Apr  6 17:41:33 2017
From: nicoddemus at gmail.com (nicoddemus)
Date: Thu, 06 Apr 2017 14:41:33 -0700
Subject: [Pytest-commit] [pytest-dev/pytest]
Message-ID: <58e6b60db0007_45a3f98b5b05c381854de@hookshot-fe6-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/fix-search-docs
  Home:   https://github.com/pytest-dev/pytest

From nicoddemus at gmail.com  Thu Apr  6 17:41:32 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 06 Apr 2017 14:41:32 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 44a3db: Pin sphinx to 1.4 when
 generating docs to workarou...
Message-ID: <58e6b60c5dcba_68363f83550c7c3c11591d@hookshot-fe1-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 44a3db3dc668b28fa3892b3cd9fb2e14aa2d7c21
      https://github.com/pytest-dev/pytest/commit/44a3db3dc668b28fa3892b3cd9fb2e14aa2d7c21
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-04-06 (Thu, 06 Apr 2017)

  Changed paths:
    A doc/en/requirements.txt

  Log Message:
  -----------
  Pin sphinx to 1.4 when generating docs to workaround search issues on RTD

Fix #2302


  Commit: c734a2d8d502a2d5c21a39b05cf7cb89c249dd57
      https://github.com/pytest-dev/pytest/commit/c734a2d8d502a2d5c21a39b05cf7cb89c249dd57
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-04-06 (Thu, 06 Apr 2017)

  Changed paths:
    A doc/en/requirements.txt

  Log Message:
  -----------
  Merge pull request #2352 from pytest-dev/fix-search-docs

Pin sphinx to 1.4 when generating docs to workaround search issues on RTD


Compare: https://github.com/pytest-dev/pytest/compare/144d90932eda...c734a2d8d502

From nicoddemus at gmail.com  Thu Apr  6 22:40:17 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 06 Apr 2017 19:40:17 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] d21798: documenting how to
 point pytest at local code
Message-ID: <58e6fc111ab10_cea3fad35433c2c19786b@hookshot-fe2-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: d217984129425321b07386cf66debd816675e07b
      https://github.com/pytest-dev/pytest/commit/d217984129425321b07386cf66debd816675e07b
  Author: Skylar Downes <skylarjhdownes at gmail.com>
  Date:   2016-09-15 (Thu, 15 Sep 2016)

  Changed paths:
    M doc/en/customize.rst

  Log Message:
  -----------
  documenting how to point pytest at local code

Related to #1937


  Commit: 383fc02ba6ffed96aa1f50f9e2f502caf0e9feb9
      https://github.com/pytest-dev/pytest/commit/383fc02ba6ffed96aa1f50f9e2f502caf0e9feb9
  Author: Skylar Downes <skylarjhdownes at gmail.com>
  Date:   2016-09-15 (Thu, 15 Sep 2016)

  Changed paths:
    M doc/en/customize.rst

  Log Message:
  -----------
  fix spacing


  Commit: 69f72c6f4b21226a8223e05f8e1c27898347205e
      https://github.com/pytest-dev/pytest/commit/69f72c6f4b21226a8223e05f8e1c27898347205e
  Author: Skylar Downes <skylarjhdownes at gmail.com>
  Date:   2016-09-15 (Thu, 15 Sep 2016)

  Changed paths:
    M doc/en/customize.rst

  Log Message:
  -----------
  fix typo


  Commit: b4fd74c6ff18af275c0a99c4ab517de6a6ccf6b3
      https://github.com/pytest-dev/pytest/commit/b4fd74c6ff18af275c0a99c4ab517de6a6ccf6b3
  Author: Skylar Downes <skylarjhdownes at gmail.com>
  Date:   2016-09-15 (Thu, 15 Sep 2016)

  Changed paths:
    M doc/en/customize.rst

  Log Message:
  -----------
  add mention of setup.py develop


  Commit: 07ad71e851fab1cf4640b9e44c62ddec66319ad2
      https://github.com/pytest-dev/pytest/commit/07ad71e851fab1cf4640b9e44c62ddec66319ad2
  Author: Skylar Downes <skylarjhdownes at gmail.com>
  Date:   2016-09-15 (Thu, 15 Sep 2016)

  Changed paths:
    M doc/en/goodpractices.rst

  Log Message:
  -----------
  clarified purpose of `pip install -e` command

ref #1937


  Commit: 81a733f2dcc16214568afeafcd84a12defe10097
      https://github.com/pytest-dev/pytest/commit/81a733f2dcc16214568afeafcd84a12defe10097
  Author: Skylar Downes <skylarjhdownes at gmail.com>
  Date:   2016-09-15 (Thu, 15 Sep 2016)

  Changed paths:
    M doc/en/getting-started.rst

  Log Message:
  -----------
  add how-to for getting started on existing project

ref #1937


  Commit: d781b76627c6b6db6c89641f63aed7b47366b3f2
      https://github.com/pytest-dev/pytest/commit/d781b76627c6b6db6c89641f63aed7b47366b3f2
  Author: Skylar Downes <skylarjhdownes at gmail.com>
  Date:   2016-09-15 (Thu, 15 Sep 2016)

  Changed paths:
    M AUTHORS

  Log Message:
  -----------
  Update AUTHORS


  Commit: f1faaea3fdebc72419d56309ece97c0f555aa3f5
      https://github.com/pytest-dev/pytest/commit/f1faaea3fdebc72419d56309ece97c0f555aa3f5
  Author: Skylar Downes <skylarjhdownes at gmail.com>
  Date:   2016-09-15 (Thu, 15 Sep 2016)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Update CHANGELOG.rst


  Commit: 330a2f67841ff12f0fd69499cec39c4025fbbbe4
      https://github.com/pytest-dev/pytest/commit/330a2f67841ff12f0fd69499cec39c4025fbbbe4
  Author: Skylar Downes <skylarjhdownes at gmail.com>
  Date:   2016-09-15 (Thu, 15 Sep 2016)

  Changed paths:
    M doc/en/getting-started.rst

  Log Message:
  -----------
  Update getting-started.rst


  Commit: 34117be98b8c880787469e82df2c65ee7e534500
      https://github.com/pytest-dev/pytest/commit/34117be98b8c880787469e82df2c65ee7e534500
  Author: Skylar Downes <skylarjhdownes at gmail.com>
  Date:   2016-09-15 (Thu, 15 Sep 2016)

  Changed paths:
    M doc/en/goodpractices.rst

  Log Message:
  -----------
  Update goodpractices.rst


  Commit: 7e2f66adc38f3609b805ee006e0987b678f731de
      https://github.com/pytest-dev/pytest/commit/7e2f66adc38f3609b805ee006e0987b678f731de
  Author: Skylar Downes <skylarjhdownes at gmail.com>
  Date:   2016-09-27 (Tue, 27 Sep 2016)

  Changed paths:
    A doc/en/existingtestsuite.rst

  Log Message:
  -----------
  Create existingtestsuite.rst


  Commit: 12ac3c7338d7a66e3c3b2e5fd742b0d49c61191b
      https://github.com/pytest-dev/pytest/commit/12ac3c7338d7a66e3c3b2e5fd742b0d49c61191b
  Author: Skylar Downes <skylarjhdownes at gmail.com>
  Date:   2016-09-27 (Tue, 27 Sep 2016)

  Changed paths:
    M doc/en/getting-started.rst

  Log Message:
  -----------
  remove existing tests stuff, add link to new page

Moved the "Contributing tests to an existing project" section to it's own page.


  Commit: 1ab1962eb1aaae693b1dfd00aadae3e6ba23748e
      https://github.com/pytest-dev/pytest/commit/1ab1962eb1aaae693b1dfd00aadae3e6ba23748e
  Author: Skylar Downes <skylarjhdownes at gmail.com>
  Date:   2016-09-27 (Tue, 27 Sep 2016)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  make issue #1934 reference a link


  Commit: 3d211da9bda2e79cd52dad92f91744985e0fd9a3
      https://github.com/pytest-dev/pytest/commit/3d211da9bda2e79cd52dad92f91744985e0fd9a3
  Author: Skylar Downes <skylarjhdownes at gmail.com>
  Date:   2016-09-27 (Tue, 27 Sep 2016)

  Changed paths:
    M doc/en/contents.rst

  Log Message:
  -----------
  add existing test suite page to table of contents


  Commit: b0c78c867dcc5b3c2ab0b3024bcaff1f29f7f975
      https://github.com/pytest-dev/pytest/commit/b0c78c867dcc5b3c2ab0b3024bcaff1f29f7f975
  Author: Skylar Downes <skylarjhdownes at gmail.com>
  Date:   2016-09-27 (Tue, 27 Sep 2016)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Update CHANGELOG.rst


  Commit: 3aa4fb62d677e18bcb618fd2d3f6439502bb3bd5
      https://github.com/pytest-dev/pytest/commit/3aa4fb62d677e18bcb618fd2d3f6439502bb3bd5
  Author: Skylar Downes <skylarjhdownes at gmail.com>
  Date:   2017-04-06 (Thu, 06 Apr 2017)

  Changed paths:
    M .github/PULL_REQUEST_TEMPLATE.md
    M .travis.yml
    M AUTHORS
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M MANIFEST.in
    M README.rst
    M _pytest/__init__.py
    M _pytest/_argcomplete.py
    M _pytest/_code/code.py
    M _pytest/_code/source.py
    M _pytest/assertion/__init__.py
    M _pytest/assertion/rewrite.py
    M _pytest/assertion/util.py
    M _pytest/cacheprovider.py
    M _pytest/capture.py
    M _pytest/compat.py
    M _pytest/config.py
    M _pytest/debugging.py
    M _pytest/fixtures.py
    M _pytest/helpconfig.py
    M _pytest/hookspec.py
    M _pytest/junitxml.py
    M _pytest/main.py
    M _pytest/mark.py
    M _pytest/monkeypatch.py
    M _pytest/pastebin.py
    M _pytest/pytester.py
    M _pytest/python.py
    M _pytest/recwarn.py
    M _pytest/runner.py
    M _pytest/setuponly.py
    M _pytest/skipping.py
    M _pytest/terminal.py
    M _pytest/tmpdir.py
    M _pytest/unittest.py
    M _pytest/vendored_packages/README.md
    R _pytest/vendored_packages/pluggy-0.3.1.dist-info/DESCRIPTION.rst
    R _pytest/vendored_packages/pluggy-0.3.1.dist-info/METADATA
    R _pytest/vendored_packages/pluggy-0.3.1.dist-info/RECORD
    R _pytest/vendored_packages/pluggy-0.3.1.dist-info/WHEEL
    R _pytest/vendored_packages/pluggy-0.3.1.dist-info/metadata.json
    R _pytest/vendored_packages/pluggy-0.3.1.dist-info/pbr.json
    R _pytest/vendored_packages/pluggy-0.3.1.dist-info/top_level.txt
    A _pytest/vendored_packages/pluggy-0.4.0.dist-info/DESCRIPTION.rst
    A _pytest/vendored_packages/pluggy-0.4.0.dist-info/INSTALLER
    A _pytest/vendored_packages/pluggy-0.4.0.dist-info/LICENSE.txt
    A _pytest/vendored_packages/pluggy-0.4.0.dist-info/METADATA
    A _pytest/vendored_packages/pluggy-0.4.0.dist-info/RECORD
    A _pytest/vendored_packages/pluggy-0.4.0.dist-info/WHEEL
    A _pytest/vendored_packages/pluggy-0.4.0.dist-info/metadata.json
    A _pytest/vendored_packages/pluggy-0.4.0.dist-info/top_level.txt
    M _pytest/vendored_packages/pluggy.py
    M appveyor.yml
    M doc/en/announce/index.rst
    M doc/en/announce/release-2.0.2.rst
    M doc/en/announce/release-2.0.3.rst
    M doc/en/announce/release-2.2.1.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.2.rst
    M doc/en/announce/release-2.3.3.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.5.0.rst
    M doc/en/announce/release-2.5.2.rst
    M doc/en/announce/release-2.6.3.rst
    M doc/en/announce/release-2.7.1.rst
    M doc/en/announce/release-2.9.2.rst
    A doc/en/announce/release-3.0.3.rst
    A doc/en/announce/release-3.0.4.rst
    A doc/en/announce/release-3.0.5.rst
    A doc/en/announce/release-3.0.6.rst
    A doc/en/announce/release-3.0.7.rst
    M doc/en/assert.rst
    M doc/en/cache.rst
    M doc/en/capture.rst
    M doc/en/conf.py
    M doc/en/doctest.rst
    M doc/en/example/markers.rst
    M doc/en/example/nonpython.rst
    M doc/en/example/parametrize.rst
    M doc/en/example/pythoncollection.rst
    M doc/en/example/reportingdemo.rst
    M doc/en/example/simple.rst
    M doc/en/faq.rst
    M doc/en/fixture.rst
    M doc/en/funcarg_compare.rst
    M doc/en/getting-started.rst
    M doc/en/goodpractices.rst
    M doc/en/index.rst
    M doc/en/monkeypatch.rst
    M doc/en/parametrize.rst
    M doc/en/projects.rst
    M doc/en/recwarn.rst
    A doc/en/requirements.txt
    M doc/en/skipping.rst
    M doc/en/talks.rst
    M doc/en/test/plugin/xdist.rst
    M doc/en/tmpdir.rst
    M doc/en/unittest.rst
    M doc/en/usage.rst
    M doc/en/writing_plugins.rst
    R plugin-test.sh
    R requirements-docs.txt
    R runtox.py
    A scripts/call-tox.bat
    A scripts/check-manifest.py
    A scripts/install-pypy.bat
    M setup.cfg
    M setup.py
    M testing/acceptance_test.py
    M testing/code/test_code.py
    M testing/code/test_excinfo.py
    M testing/python/approx.py
    M testing/python/collect.py
    M testing/python/fixture.py
    M testing/python/integration.py
    M testing/python/metafunc.py
    M testing/python/raises.py
    M testing/test_assertion.py
    M testing/test_assertrewrite.py
    M testing/test_capture.py
    M testing/test_collection.py
    A 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_unittest.py
    M tox.ini

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


  Commit: f7caa56a6b045b0541024374094c213fbcf58794
      https://github.com/pytest-dev/pytest/commit/f7caa56a6b045b0541024374094c213fbcf58794
  Author: Skylar Downes <skylarjhdownes at gmail.com>
  Date:   2017-04-06 (Thu, 06 Apr 2017)

  Changed paths:
    M doc/en/customize.rst
    M doc/en/goodpractices.rst
    M doc/en/nose.rst

  Log Message:
  -----------
  moved documentation of conftest.py hack to nose.rst


  Commit: 639c592f319c788ca0cf909a0ecef6fa23d47393
      https://github.com/pytest-dev/pytest/commit/639c592f319c788ca0cf909a0ecef6fa23d47393
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-04-06 (Thu, 06 Apr 2017)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Add missing link in CHANGELOG


  Commit: 546269792483e7a6f6e0213bd5ef3dbb29b7373b
      https://github.com/pytest-dev/pytest/commit/546269792483e7a6f6e0213bd5ef3dbb29b7373b
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-04-06 (Thu, 06 Apr 2017)

  Changed paths:
    M doc/en/nose.rst

  Log Message:
  -----------
  Small formatting fixes to nose.rst


  Commit: 45852386e58e250951bbf06eb30a87e2daa5c107
      https://github.com/pytest-dev/pytest/commit/45852386e58e250951bbf06eb30a87e2daa5c107
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-04-06 (Thu, 06 Apr 2017)

  Changed paths:
    M doc/en/existingtestsuite.rst

  Log Message:
  -----------
  Fix small typo in docs


  Commit: f2300fbab2525d3d95f125e14c0bbd9d08c58d77
      https://github.com/pytest-dev/pytest/commit/f2300fbab2525d3d95f125e14c0bbd9d08c58d77
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-04-06 (Thu, 06 Apr 2017)

  Changed paths:
    M doc/en/existingtestsuite.rst
    M doc/en/getting-started.rst

  Log Message:
  -----------
  Fix links in docs


  Commit: 8c69d5c9398c7759490cb50cb77b3230b5f89fe4
      https://github.com/pytest-dev/pytest/commit/8c69d5c9398c7759490cb50cb77b3230b5f89fe4
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-04-06 (Thu, 06 Apr 2017)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    M doc/en/contents.rst
    M doc/en/customize.rst
    A doc/en/existingtestsuite.rst
    M doc/en/getting-started.rst
    M doc/en/goodpractices.rst
    M doc/en/nose.rst

  Log Message:
  -----------
  Merge pull request #1940 from skylarjhdownes/master

adding documentation about pointing pytest at source files


Compare: https://github.com/pytest-dev/pytest/compare/c734a2d8d502...8c69d5c9398c

From nicoddemus at gmail.com  Fri Apr  7 13:31:37 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Fri, 07 Apr 2017 10:31:37 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 21f1c2: Update fixtures.py
Message-ID: <58e7ccf9c3b10_13243f940f087c341174cf@hookshot-fe2-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 21f1c2b03f21db8aa54dea61d7f96d1c0573af79
      https://github.com/pytest-dev/pytest/commit/21f1c2b03f21db8aa54dea61d7f96d1c0573af79
  Author: Ben Lloyd <shobute at users.noreply.github.com>
  Date:   2017-04-07 (Fri, 07 Apr 2017)

  Changed paths:
    M _pytest/fixtures.py

  Log Message:
  -----------
  Update fixtures.py

Corrected "or or" typo in docstring (and made indentation consistent).


  Commit: 47a2a77cb494a8cac3bfd9f5d6af13d6d551abcb
      https://github.com/pytest-dev/pytest/commit/47a2a77cb494a8cac3bfd9f5d6af13d6d551abcb
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-04-07 (Fri, 07 Apr 2017)

  Changed paths:
    M _pytest/fixtures.py

  Log Message:
  -----------
  Merge pull request #2354 from shobute/patch-1

Corrected documentation typo in fixtures.py


Compare: https://github.com/pytest-dev/pytest/compare/8c69d5c9398c...47a2a77cb494

From nicoddemus at gmail.com  Tue Apr 11 18:05:03 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 11 Apr 2017 15:05:03 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 0ab85e: Changed behavior if
 --lf and --ff are both used.
Message-ID: <58ed530f9691c_2e2c3fd9dca07c381348bb@hookshot-fe5-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 0ab85e7a9cfc6f36a37a6e79dbb73b2b83c997bc
      https://github.com/pytest-dev/pytest/commit/0ab85e7a9cfc6f36a37a6e79dbb73b2b83c997bc
  Author: Jonas Obrist <jonas.obrist at hde.co.jp>
  Date:   2017-04-10 (Mon, 10 Apr 2017)

  Changed paths:
    M _pytest/cacheprovider.py
    M testing/test_cache.py

  Log Message:
  -----------
  Changed behavior if --lf and --ff are both used.

When using both --last-failed/--lf and --failed-first/--ff pytest would
run all tests with failed tests first (as if --lf was not provied). This
patch changes it so that when using both flags, only the last failed
tests are run. This makes it easier to set --ff as the default behavior
via the config file and then selectively use --lf to only run the last
failed tests.


  Commit: 08d83a5c6a7c74cd00d21887731ad26a4412d7fd
      https://github.com/pytest-dev/pytest/commit/08d83a5c6a7c74cd00d21887731ad26a4412d7fd
  Author: Jonas Obrist <jonas.obrist at hde.co.jp>
  Date:   2017-04-10 (Mon, 10 Apr 2017)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst

  Log Message:
  -----------
  updated changelog and authors files


  Commit: 1125786e787b320dd26d8c720c6ce81c72a1c838
      https://github.com/pytest-dev/pytest/commit/1125786e787b320dd26d8c720c6ce81c72a1c838
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-04-11 (Tue, 11 Apr 2017)

  Changed paths:
    M testing/test_cache.py

  Log Message:
  -----------
  Improve --lf/--ff test as commented during review


  Commit: 02da278894ae5b760f61b06f71c806b5366b8f1f
      https://github.com/pytest-dev/pytest/commit/02da278894ae5b760f61b06f71c806b5366b8f1f
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-04-11 (Tue, 11 Apr 2017)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    M _pytest/cacheprovider.py
    M testing/test_cache.py

  Log Message:
  -----------
  Merge pull request #2357 from ojii/lastfailed-failedfirst

Changed behavior if --lf and --ff are both used.


Compare: https://github.com/pytest-dev/pytest/compare/83b241b449b0...02da278894ae

From nicoddemus at gmail.com  Tue Apr 11 19:59:06 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Tue, 11 Apr 2017 16:59:06 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 1b5f89: Ensure rewritten
 modules don't inherit __future__ ...
Message-ID: <58ed6dcad7807_3b783fab9f8fbc381242ca@hookshot-fe2-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 1b5f898dc56dca92dc8a9a2ca10daf1e7cf9291f
      https://github.com/pytest-dev/pytest/commit/1b5f898dc56dca92dc8a9a2ca10daf1e7cf9291f
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-04-06 (Thu, 06 Apr 2017)

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

  Log Message:
  -----------
  Ensure rewritten modules don't inherit __future__ flags from pytest

In a recent refactoring we enabled all __future__ features in pytest
modules, but that has the unwanted side effect of propagating those
features to compile()'d modules inside assertion rewriting, unless
we pass dont_inherit=False to compile().


  Commit: 78ac1bf5d17bbf4792d045c2fea025c79f532d84
      https://github.com/pytest-dev/pytest/commit/78ac1bf5d17bbf4792d045c2fea025c79f532d84
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-04-11 (Tue, 11 Apr 2017)

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

  Log Message:
  -----------
  Merge pull request #2350 from nicoddemus/future-imports-rewrite

Ensure rewritten modules don't inherit __future__ flags from pytest


Compare: https://github.com/pytest-dev/pytest/compare/02da278894ae...78ac1bf5d17b

From nicoddemus at gmail.com  Wed Apr 12 06:58:17 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 12 Apr 2017 03:58:17 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 7d4ac1: Fix #2343: Replace
 version checks by constants.
Message-ID: <58ee08498eba7_161e3fc1b9a77c30163687@hookshot-fe3-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 7d4ac14a3170a0c0d1e9a8800e71393f5f9429fe
      https://github.com/pytest-dev/pytest/commit/7d4ac14a3170a0c0d1e9a8800e71393f5f9429fe
  Author: Michael Howitz <mh at gocept.com>
  Date:   2017-04-12 (Wed, 12 Apr 2017)

  Changed paths:
    M _pytest/_code/code.py
    M _pytest/compat.py

  Log Message:
  -----------
  Fix #2343: Replace version checks by constants.

This way they do not have to be recomputed at runtime.


  Commit: 7dfdfa58133926b3acfb17ca9298d7669784a6d8
      https://github.com/pytest-dev/pytest/commit/7dfdfa58133926b3acfb17ca9298d7669784a6d8
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-04-12 (Wed, 12 Apr 2017)

  Changed paths:
    M _pytest/_code/code.py
    M _pytest/compat.py

  Log Message:
  -----------
  Merge pull request #2359 from pytest-dev/fix-2343

Fix #2343: Replace version checks by constants.


Compare: https://github.com/pytest-dev/pytest/compare/47a2a77cb494...7dfdfa581339

From nicoddemus at gmail.com  Wed Apr 12 06:58:18 2017
From: nicoddemus at gmail.com (nicoddemus)
Date: Wed, 12 Apr 2017 03:58:18 -0700
Subject: [Pytest-commit] [pytest-dev/pytest]
Message-ID: <58ee084abd54c_135b83fa75a84fc381295f6@hookshot-fe-6dbb0c4.cp1-iad.github.net.mail>

  Branch: refs/heads/fix-2343
  Home:   https://github.com/pytest-dev/pytest

From nicoddemus at gmail.com  Fri Apr 21 15:23:27 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Fri, 21 Apr 2017 12:23:27 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] dcefb2: Try not to assume a
 module's file extension is .py
Message-ID: <58fa5c2f89534_2b133fadd47f3c3c681c6@hookshot-fe1-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: dcefb287fc2bd50c22af10f468e7146e7c4d48f5
      https://github.com/pytest-dev/pytest/commit/dcefb287fc2bd50c22af10f468e7146e7c4d48f5
  Author: Kodi Arfer <git at arfer.net>
  Date:   2017-04-19 (Wed, 19 Apr 2017)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    M _pytest/python.py
    M testing/python/collect.py

  Log Message:
  -----------
  Try not to assume a module's file extension is .py


  Commit: 80225ce72ccea8c9c31781c3cc2130764c8b898f
      https://github.com/pytest-dev/pytest/commit/80225ce72ccea8c9c31781c3cc2130764c8b898f
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-04-21 (Fri, 21 Apr 2017)

  Changed paths:
    M AUTHORS
    M CHANGELOG.rst
    M _pytest/python.py
    M testing/python/collect.py

  Log Message:
  -----------
  Merge pull request #2374 from Kodiologist/getmodpath-file-ext

Try not to assume a module's file extension is .py


Compare: https://github.com/pytest-dev/pytest/compare/581b463b60d0...80225ce72cce

From nicoddemus at gmail.com  Fri Apr 21 15:24:22 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Fri, 21 Apr 2017 12:24:22 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] 5818e6: remove pytest_namespace
 from _pytest/assertion
Message-ID: <58fa5c6689fcd_22403fa218663c2c72772@hookshot-fe1-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 5818e65cf3407f672bfc9b50c54385e45a1ef98b
      https://github.com/pytest-dev/pytest/commit/5818e65cf3407f672bfc9b50c54385e45a1ef98b
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M _pytest/assertion/__init__.py
    M pytest.py

  Log Message:
  -----------
  remove pytest_namespace from _pytest/assertion


  Commit: fab9b993f80ce696e7be41bcd76a415a9fdce7c6
      https://github.com/pytest-dev/pytest/commit/fab9b993f80ce696e7be41bcd76a415a9fdce7c6
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M _pytest/config.py
    M _pytest/freeze_support.py
    M pytest.py

  Log Message:
  -----------
  remove pytest_namespace from _pytest.freeze_support


  Commit: 794fd5658c53a22c304c94a8f703d3e05edaa7ac
      https://github.com/pytest-dev/pytest/commit/794fd5658c53a22c304c94a8f703d3e05edaa7ac
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M _pytest/debugging.py
    M pytest.py

  Log Message:
  -----------
  remove pytest_namespace from _pytest/debugging.py


  Commit: c74103f395f5ff1d338c79fe8daa50ce472c5552
      https://github.com/pytest-dev/pytest/commit/c74103f395f5ff1d338c79fe8daa50ce472c5552
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M _pytest/fixtures.py
    M _pytest/recwarn.py
    M pytest.py

  Log Message:
  -----------
  remove pytest_namespace from recwarn and fixture decorators


  Commit: 6a02cdbb35cdd37518ff6522deb38ba8e3b97b97
      https://github.com/pytest-dev/pytest/commit/6a02cdbb35cdd37518ff6522deb38ba8e3b97b97
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M _pytest/runner.py
    M pytest.py

  Log Message:
  -----------
  remove pytest_namespace from _pytest/runner.py


  Commit: 90788defb24076663f8f0a89828885fd49e16076
      https://github.com/pytest-dev/pytest/commit/90788defb24076663f8f0a89828885fd49e16076
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M _pytest/mark.py
    M pytest.py

  Log Message:
  -----------
  remove pytest_namespace from _pytest.mark and fix latent pytest nesting bug


  Commit: 9b755f6ec6077c2e6d49b2d893f147cc7d35cce2
      https://github.com/pytest-dev/pytest/commit/9b755f6ec6077c2e6d49b2d893f147cc7d35cce2
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M _pytest/skipping.py
    M pytest.py

  Log Message:
  -----------
  remove pytest_namespace from _pytest.skipping


  Commit: 7d797b7dbfc07915c421c91a007e29ea7467bdc6
      https://github.com/pytest-dev/pytest/commit/7d797b7dbfc07915c421c91a007e29ea7467bdc6
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M _pytest/hookspec.py

  Log Message:
  -----------
  add a note about the deprecation of the pytest_namespace hook


  Commit: 839c9361539aec8bf90a56cdea89ddccc8c40754
      https://github.com/pytest-dev/pytest/commit/839c9361539aec8bf90a56cdea89ddccc8c40754
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M _pytest/mark.py

  Log Message:
  -----------
  _pytest.mark: fix unconfigure after bad configure, still potential bug


  Commit: 9b58d6eaca17758551929f0ebb390ad900e03581
      https://github.com/pytest-dev/pytest/commit/9b58d6eaca17758551929f0ebb390ad900e03581
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M _pytest/compat.py
    M pytest.py

  Log Message:
  -----------
  prepare a own pytest.collect fake module in oder to remove the nested builtin namespaces


  Commit: 61f418a26750bd89d26aff9ad3f3cb1eb534b838
      https://github.com/pytest-dev/pytest/commit/61f418a26750bd89d26aff9ad3f3cb1eb534b838
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

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

  Log Message:
  -----------
  hollow out pytest_namespace in _pytest.fixtures


  Commit: 99c8f2d4035a15543fefc6cef2c3abb883a97d23
      https://github.com/pytest-dev/pytest/commit/99c8f2d4035a15543fefc6cef2c3abb883a97d23
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M _pytest/main.py
    M pytest.py

  Log Message:
  -----------
  remove pytest_namespace from _pytest.main


  Commit: ae234786eabeae89ece706f826dcac5dcdaca012
      https://github.com/pytest-dev/pytest/commit/ae234786eabeae89ece706f826dcac5dcdaca012
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M _pytest/python.py
    M pytest.py

  Log Message:
  -----------
  remove pytest_namespace from _pytest.python


  Commit: 23bc9815c4aaf6f247df462dab665f9311e875ca
      https://github.com/pytest-dev/pytest/commit/23bc9815c4aaf6f247df462dab665f9311e875ca
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M _pytest/fixtures.py

  Log Message:
  -----------
  remove pytest_namespace from _pytest.fixtures


  Commit: 809c36e1f6d5cd837da798026f20aa62c6c7a4e2
      https://github.com/pytest-dev/pytest/commit/809c36e1f6d5cd837da798026f20aa62c6c7a4e2
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M CHANGELOG.rst
    M doc/en/writing_plugins.rst

  Log Message:
  -----------
  add a changelog note for pytest_namespace


  Commit: 92f6ab188137a44479b0c6bcf209c3bf2ea31b41
      https://github.com/pytest-dev/pytest/commit/92f6ab188137a44479b0c6bcf209c3bf2ea31b41
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M _pytest/compat.py
    M _pytest/debugging.py
    M _pytest/fixtures.py
    M _pytest/main.py
    M _pytest/monkeypatch.py
    M _pytest/python.py
    M _pytest/recwarn.py
    M _pytest/runner.py
    M _pytest/skipping.py

  Log Message:
  -----------
  fix all singular internal module imports and add a test for them


  Commit: bb750a794566c2e2b10066d37ceba49cdfba7238
      https://github.com/pytest-dev/pytest/commit/bb750a794566c2e2b10066d37ceba49cdfba7238
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    A testing/test_modimport.py

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


  Commit: 4d31ea83160331d8eb97de477bc3476d1a39653f
      https://github.com/pytest-dev/pytest/commit/4d31ea83160331d8eb97de477bc3476d1a39653f
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M testing/test_modimport.py

  Log Message:
  -----------
  add a comment explaining the modimport tests


  Commit: 7cdefce656119ec023bf371f14076c76f6782ceb
      https://github.com/pytest-dev/pytest/commit/7cdefce656119ec023bf371f14076c76f6782ceb
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M _pytest/fixtures.py
    M _pytest/python.py
    M _pytest/recwarn.py
    M _pytest/skipping.py
    M pytest.py

  Log Message:
  -----------
  fix up oversights


  Commit: 147bb8aea5b4c50f0ce432bf6d0cdf547c24cf90
      https://github.com/pytest-dev/pytest/commit/147bb8aea5b4c50f0ce432bf6d0cdf547c24cf90
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M _pytest/main.py

  Log Message:
  -----------
  correct setting pytest.config


  Commit: c9ab4213986c5f074a69b7abd68f0dfca8db89ba
      https://github.com/pytest-dev/pytest/commit/c9ab4213986c5f074a69b7abd68f0dfca8db89ba
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M _pytest/fixtures.py

  Log Message:
  -----------
  fix python2 only import loop failure


  Commit: efe03400d8a1a32666fdbc8b9f1c38d7c085322d
      https://github.com/pytest-dev/pytest/commit/efe03400d8a1a32666fdbc8b9f1c38d7c085322d
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M _pytest/nose.py
    M _pytest/unittest.py

  Log Message:
  -----------
  fixup nose/pytest plugins


  Commit: 6165939b0d957497208a93e0737ec0d937cd791b
      https://github.com/pytest-dev/pytest/commit/6165939b0d957497208a93e0737ec0d937cd791b
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M _pytest/python.py

  Log Message:
  -----------
  fix rebase mistakes


  Commit: ebeba79be373a06b4a5fccce3fe1fadff60eddaa
      https://github.com/pytest-dev/pytest/commit/ebeba79be373a06b4a5fccce3fe1fadff60eddaa
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M _pytest/mark.py
    M pytest.py

  Log Message:
  -----------
  remove the namespace hook from mark after the param feature merge


  Commit: afb1778294bf4d4cd93d8695873d0101c3db18bf
      https://github.com/pytest-dev/pytest/commit/afb1778294bf4d4cd93d8695873d0101c3db18bf
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M _pytest/main.py

  Log Message:
  -----------
  put in a singular namespace hook to work around the strange issue


  Commit: 25371ddbfd07c1064e26f29a7bc45df3b9928c18
      https://github.com/pytest-dev/pytest/commit/25371ddbfd07c1064e26f29a7bc45df3b9928c18
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-04-21 (Fri, 21 Apr 2017)

  Changed paths:
    M CHANGELOG.rst
    M _pytest/assertion/__init__.py
    M _pytest/compat.py
    M _pytest/config.py
    M _pytest/debugging.py
    M _pytest/fixtures.py
    M _pytest/freeze_support.py
    M _pytest/hookspec.py
    M _pytest/main.py
    M _pytest/mark.py
    M _pytest/monkeypatch.py
    M _pytest/nose.py
    M _pytest/python.py
    M _pytest/recwarn.py
    M _pytest/runner.py
    M _pytest/skipping.py
    M _pytest/unittest.py
    M doc/en/writing_plugins.rst
    M pytest.py
    A testing/test_modimport.py

  Log Message:
  -----------
  Merge pull request #2315 from RonnyPfannschmidt/namespace-hook

remove pytest internal usage of the namespace hook


Compare: https://github.com/pytest-dev/pytest/compare/80cabca21aba...25371ddbfd07

From nicoddemus at gmail.com  Wed Apr 26 19:55:54 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Wed, 26 Apr 2017 16:55:54 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] a9b44c: Update docs
Message-ID: <5901338a7f31e_5ff03fad6c17bc2812127@hookshot-fe2-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: a9b44c45298ca3d5560f9c9245914fd601a2fc14
      https://github.com/pytest-dev/pytest/commit/a9b44c45298ca3d5560f9c9245914fd601a2fc14
  Author: Krzysztof Szularz <krzysztof at szularz.pl>
  Date:   2017-04-25 (Tue, 25 Apr 2017)

  Changed paths:
    M doc/en/fixture.rst

  Log Message:
  -----------
  Update docs

Remove not needed `request` arg in order to simplify the example.


  Commit: f0533194ed99648bec45e5ae0120a3f6bf6c2eb1
      https://github.com/pytest-dev/pytest/commit/f0533194ed99648bec45e5ae0120a3f6bf6c2eb1
  Author: Krzysztof Szularz <krzysztof at szularz.pl>
  Date:   2017-04-26 (Wed, 26 Apr 2017)

  Changed paths:
    M doc/en/fixture.rst

  Log Message:
  -----------
  Update fixture.rst

Remove yet another not needed `request` argument in fixture definition.


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

  Changed paths:
    M doc/en/fixture.rst

  Log Message:
  -----------
  Merge pull request #2378 from szuliq/patch-1

Update docs


Compare: https://github.com/pytest-dev/pytest/compare/314d4afa57e1...d7d2249d994a

From nicoddemus at gmail.com  Thu Apr 27 08:10:25 2017
From: nicoddemus at gmail.com (Bruno Oliveira)
Date: Thu, 27 Apr 2017 05:10:25 -0700
Subject: [Pytest-commit] [pytest-dev/pytest] c3aee4: second take at
 setuptools_scm
Message-ID: <5901dfb111ccc_7ac63fdec235bc3c765bb@hookshot-fe3-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: c3aee4b1e64efa7893bcacbfde793e04f01a8dda
      https://github.com/pytest-dev/pytest/commit/c3aee4b1e64efa7893bcacbfde793e04f01a8dda
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-04-19 (Wed, 19 Apr 2017)

  Changed paths:
    M .gitignore
    M HOWTORELEASE.rst
    M _pytest/__init__.py
    M setup.py

  Log Message:
  -----------
  second take at setuptools_scm

since setuptools 18.6 fixes the issues with develop installs

https://github.com/pypa/setuptools/blob/master/CHANGES.rst#186

https://github.com/pypa/setuptools/issues/439


  Commit: 31e6fe8f52ef90adcb6a8bafcf08b26b8796b931
      https://github.com/pytest-dev/pytest/commit/31e6fe8f52ef90adcb6a8bafcf08b26b8796b931
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-04-19 (Wed, 19 Apr 2017)

  Changed paths:
    M HOWTORELEASE.rst

  Log Message:
  -----------
  HOWTORELEASE.tst: use restructuredtext autonumbering


  Commit: c0a51f56624fef1b1977a285dcf1d5430e59a94e
      https://github.com/pytest-dev/pytest/commit/c0a51f56624fef1b1977a285dcf1d5430e59a94e
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-04-19 (Wed, 19 Apr 2017)

  Changed paths:
    M scripts/check-manifest.py
    M tox.ini

  Log Message:
  -----------
  restore check-manifst functionality


  Commit: 2cf422733c0fadb43a707eb6c942425f2cc312a1
      https://github.com/pytest-dev/pytest/commit/2cf422733c0fadb43a707eb6c942425f2cc312a1
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-04-19 (Wed, 19 Apr 2017)

  Changed paths:
    M _pytest/__init__.py
    M setup.py
    M tox.ini

  Log Message:
  -----------
  restore linting, drop _pytest._version for check-manifest


  Commit: 4242bf62627f90d895f32889da43dda62775a1fa
      https://github.com/pytest-dev/pytest/commit/4242bf62627f90d895f32889da43dda62775a1fa
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-04-20 (Thu, 20 Apr 2017)

  Changed paths:
    M _pytest/__init__.py

  Log Message:
  -----------
  use unknown to specify unknown versions


  Commit: e02cb6d7ce804d242496e50cb7e892b740290dcd
      https://github.com/pytest-dev/pytest/commit/e02cb6d7ce804d242496e50cb7e892b740290dcd
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-04-23 (Sun, 23 Apr 2017)

  Changed paths:
    M _pytest/__init__.py
    M setup.cfg
    M setup.py

  Log Message:
  -----------
  restore setuptools_scm write_to usage


  Commit: a280e43949a489192dd7a80ee9c982843d9b153e
      https://github.com/pytest-dev/pytest/commit/a280e43949a489192dd7a80ee9c982843d9b153e
  Author: Ronny Pfannschmidt <ronny.pfannschmidt at redhat.com>
  Date:   2017-04-26 (Wed, 26 Apr 2017)

  Changed paths:
    M _pytest/__init__.py

  Log Message:
  -----------
  fix import error


  Commit: cccb2cc92ba56033ef21c8627bb00debd6575aef
      https://github.com/pytest-dev/pytest/commit/cccb2cc92ba56033ef21c8627bb00debd6575aef
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-04-27 (Thu, 27 Apr 2017)

  Changed paths:
    M .gitignore
    M HOWTORELEASE.rst
    M _pytest/__init__.py
    M scripts/check-manifest.py
    M setup.cfg
    M setup.py
    M tox.ini

  Log Message:
  -----------
  Merge pull request #1834 from RonnyPfannschmidt/setuptools-scm-take-2

second take at setuptools_scm


Compare: https://github.com/pytest-dev/pytest/compare/25371ddbfd07...cccb2cc92ba5