Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: ac9c8fcdab8fcaa932100fed9dd67424609e310b
      
https://github.com/pytest-dev/pytest/commit/ac9c8fcdab8fcaa932100fed9dd67424609e310b
  Author: Andreas Pelme <andr...@pelme.se>
  Date:   2017-05-31 (Wed, 31 May 2017)

  Changed paths:
    M testing/test_assertrewrite.py

  Log Message:
  -----------
  Failing test for issue #2121


  Commit: 021e843427c6f5e79ee4a5b47ef3015599292822
      
https://github.com/pytest-dev/pytest/commit/021e843427c6f5e79ee4a5b47ef3015599292822
  Author: Andreas Pelme <andr...@pelme.se>
  Date:   2017-05-31 (Wed, 31 May 2017)

  Changed paths:
    M _pytest/assertion/rewrite.py

  Log Message:
  -----------
  Fixed #2121 Use `py.path`s fnmatch. This fixes an issue where
python_files handled properly when rewriting assertions.


  Commit: 5de203195ce1a704f33a8d5c54dbe8996fe98b1e
      
https://github.com/pytest-dev/pytest/commit/5de203195ce1a704f33a8d5c54dbe8996fe98b1e
  Author: Andreas Pelme <andr...@pelme.se>
  Date:   2017-05-31 (Wed, 31 May 2017)

  Changed paths:
    A changelog/2121.bugfix

  Log Message:
  -----------
  Add changelog for #2121


  Commit: c98ad2a0a0c8c1de278255cfec534dd928be2e85
      
https://github.com/pytest-dev/pytest/commit/c98ad2a0a0c8c1de278255cfec534dd928be2e85
  Author: Andreas Pelme <andr...@pelme.se>
  Date:   2017-05-31 (Wed, 31 May 2017)

  Changed paths:
    M setup.py

  Log Message:
  -----------
  Install py 1.4.33 that contains the fnmatch py.std import fix.


  Commit: 409d2f1d54d7f17e33b49f6a3dce314931557550
      
https://github.com/pytest-dev/pytest/commit/409d2f1d54d7f17e33b49f6a3dce314931557550
  Author: Bruno Oliveira <nicodde...@gmail.com>
  Date:   2017-05-31 (Wed, 31 May 2017)

  Changed paths:
    A changelog/810.doc
    M doc/en/skipping.rst

  Log Message:
  -----------
  Make it clear that pytest.xfail stops the test

Also did a general review of the document to improve the flow

Fix #810


  Commit: 5d785e415ecd35a3e651d7b0906cdca55af4fb1c
      
https://github.com/pytest-dev/pytest/commit/5d785e415ecd35a3e651d7b0906cdca55af4fb1c
  Author: Ronny Pfannschmidt <opensou...@ronnypfannschmidt.de>
  Date:   2017-06-01 (Thu, 01 Jun 2017)

  Changed paths:
    A changelog/810.doc
    M doc/en/skipping.rst

  Log Message:
  -----------
  Merge pull request #2454 from nicoddemus/xfail-docs

Make it clear that pytest.xfail stops the test


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

  Changed paths:
    M _pytest/assertion/rewrite.py
    A changelog/2121.bugfix
    M setup.py
    M testing/test_assertrewrite.py

  Log Message:
  -----------
  Merge pull request #2140 from pelme/issue2121

Handle python_files correctly in assertion rewrite


  Commit: f74f14f038285b030ce34f3b0c8f9c59eea08e2d
      
https://github.com/pytest-dev/pytest/commit/f74f14f038285b030ce34f3b0c8f9c59eea08e2d
  Author: Segev Finer <segev...@gmail.com>
  Date:   2017-06-01 (Thu, 01 Jun 2017)

  Changed paths:
    M AUTHORS
    M _pytest/config.py
    M _pytest/helpconfig.py
    A changelog/1999.bugfix
    M testing/test_conftest.py

  Log Message:
  -----------
  Fix --help with required options

This works by adding an argparse Action that will raise an exception in
order to skip the rest of the argument parsing. This prevents argparse
from quitting due to missing required arguments, similar to the way that
the builtin argparse --help option is implemented by raising SystemExit.

Fixes: #1999


  Commit: 9abff7f72f37b15df74a883b8cff41e9c1db5989
      
https://github.com/pytest-dev/pytest/commit/9abff7f72f37b15df74a883b8cff41e9c1db5989
  Author: Segev Finer <segev...@gmail.com>
  Date:   2017-06-01 (Thu, 01 Jun 2017)

  Changed paths:
    M _pytest/helpconfig.py

  Log Message:
  -----------
  Add a docstring to HelpAction


  Commit: f826b23f588fe9f090d233d491928c8a8f60e0ce
      
https://github.com/pytest-dev/pytest/commit/f826b23f588fe9f090d233d491928c8a8f60e0ce
  Author: Ronny Pfannschmidt <opensou...@ronnypfannschmidt.de>
  Date:   2017-06-02 (Fri, 02 Jun 2017)

  Changed paths:
    M AUTHORS
    M _pytest/config.py
    M _pytest/helpconfig.py
    A changelog/1999.bugfix
    M testing/test_conftest.py

  Log Message:
  -----------
  Merge pull request #2458 from segevfiner/fix-required-options-help

Fix --help with required options


  Commit: 05796be21a4421e5f76893afd34140706a71b42b
      
https://github.com/pytest-dev/pytest/commit/05796be21a4421e5f76893afd34140706a71b42b
  Author: Segev Finer <segev...@gmail.com>
  Date:   2017-06-02 (Fri, 02 Jun 2017)

  Changed paths:
    M _pytest/capture.py

  Log Message:
  -----------
  A workaround for Python 3.6 WindowsConsoleIO breaking with FDCapture

Python 3.6 implemented unicode console handling for Windows. This works
by reading/writing to the raw console handle using
``{Read,Write}ConsoleW``.

The problem is that we are going to ``dup2`` over the stdio file
descriptors when doing ``FDCapture`` and this will ``CloseHandle`` the
handles used by Python to write to the console. Though there is still some
weirdness and the console handle seems to only be closed randomly and not
on the first call to ``CloseHandle``, or maybe it gets reopened with the
same handle value when we suspend capturing.

The workaround in this case will reopen stdio with a different fd which
also means a different handle by replicating the logic in
"Py_lifecycle.c:initstdio/create_stdio".

See https://github.com/pytest-dev/py/issues/103


  Commit: 59b3693988fcc19a9f5d7aa5c31cc7de28fcf6b7
      
https://github.com/pytest-dev/pytest/commit/59b3693988fcc19a9f5d7aa5c31cc7de28fcf6b7
  Author: Segev Finer <segev...@gmail.com>
  Date:   2017-06-02 (Fri, 02 Jun 2017)

  Changed paths:
    M _pytest/capture.py

  Log Message:
  -----------
  Fixed wrong if in the WindowsConsoleIO workaround


  Commit: 01ed6dfc3bd29b2d76d3e9ed079f2f0f648c0179
      
https://github.com/pytest-dev/pytest/commit/01ed6dfc3bd29b2d76d3e9ed079f2f0f648c0179
  Author: Segev Finer <segev...@gmail.com>
  Date:   2017-06-02 (Fri, 02 Jun 2017)

  Changed paths:
    A changelog/103.bugfix

  Log Message:
  -----------
  Added a changelog entry for the WindowsConsoleIO workaround


  Commit: 1863b7c7b263b3161c7ac79854db37ab67919529
      
https://github.com/pytest-dev/pytest/commit/1863b7c7b263b3161c7ac79854db37ab67919529
  Author: Bruno Oliveira <nicodde...@gmail.com>
  Date:   2017-06-03 (Sat, 03 Jun 2017)

  Changed paths:
    M _pytest/capture.py
    A changelog/103.bugfix

  Log Message:
  -----------
  Merge pull request #2462 from segevfiner/py36-windowsconsoleio-workaround

[WIP] A workaround for Python 3.6 WindowsConsoleIO breaking with FDCapture


  Commit: 5ee9793c99be392209a4febc9456a2782843a3a7
      
https://github.com/pytest-dev/pytest/commit/5ee9793c99be392209a4febc9456a2782843a3a7
  Author: Bruno Oliveira <nicodde...@gmail.com>
  Date:   2017-06-03 (Sat, 03 Jun 2017)

  Changed paths:
    R changelog/103.bugfix
    A changelog/2467.bugfix

  Log Message:
  -----------
  Fix CHANGELOG issue id

Fix #2467


  Commit: 54a90e955588a9850e814c8a514179ab7be0b6ae
      
https://github.com/pytest-dev/pytest/commit/54a90e955588a9850e814c8a514179ab7be0b6ae
  Author: ApaDoctor <apadoc...@gmail.com>
  Date:   2017-06-06 (Tue, 06 Jun 2017)

  Changed paths:
    M _pytest/config.py
    M _pytest/hookspec.py
    M _pytest/vendored_packages/pluggy.py
    M doc/en/writing_plugins.rst

  Log Message:
  -----------
  docs: Create links for objects to show the api


  Commit: 80944e32ad44550799ef5c443aa5b115b8e10c25
      
https://github.com/pytest-dev/pytest/commit/80944e32ad44550799ef5c443aa5b115b8e10c25
  Author: Bruno Oliveira <nicodde...@gmail.com>
  Date:   2017-06-06 (Tue, 06 Jun 2017)

  Changed paths:
    A changelog/2331.doc

  Log Message:
  -----------
  Add CHANGELOG entry


  Commit: 57e2ced96933e15a4428eb5a74143d470cb94084
      
https://github.com/pytest-dev/pytest/commit/57e2ced96933e15a4428eb5a74143d470cb94084
  Author: Bruno Oliveira <nicodde...@gmail.com>
  Date:   2017-06-06 (Tue, 06 Jun 2017)

  Changed paths:
    M _pytest/config.py
    M _pytest/hookspec.py
    M _pytest/vendored_packages/pluggy.py
    A changelog/2331.doc
    M doc/en/writing_plugins.rst

  Log Message:
  -----------
  Merge pull request #2473 from ApaDoctor/docs-fixes

docs: Create links for objects to show the api


  Commit: c67bf9d82aa7de5576a34337a16a1f1447085fdd
      
https://github.com/pytest-dev/pytest/commit/c67bf9d82aa7de5576a34337a16a1f1447085fdd
  Author: Bruno Oliveira <nicodde...@gmail.com>
  Date:   2017-06-06 (Tue, 06 Jun 2017)

  Changed paths:
    M AUTHORS
    M _pytest/assertion/rewrite.py
    M _pytest/capture.py
    M _pytest/config.py
    M _pytest/helpconfig.py
    M _pytest/hookspec.py
    M _pytest/vendored_packages/pluggy.py
    A changelog/1999.bugfix
    A changelog/2121.bugfix
    A changelog/2331.doc
    A changelog/2467.bugfix
    A changelog/810.doc
    M doc/en/skipping.rst
    M doc/en/writing_plugins.rst
    M setup.py
    M testing/test_assertrewrite.py
    M testing/test_conftest.py

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


Compare: 
https://github.com/pytest-dev/pytest/compare/9adf513c4b28...c67bf9d82aa7
_______________________________________________
pytest-commit mailing list
pytest-commit@python.org
https://mail.python.org/mailman/listinfo/pytest-commit

Reply via email to