jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
10,665 Commits 2 Branches 0 Tags 34 MiB
Commit Graph

1330 Commits

Author SHA1 Message Date
Anthony Sottile 4318698bae Remove 'b' from sys.stdout.mode 2019-05-14 15:00:59 -07:00
Evan Kepner 2ad36b1402
add #5250 changelog entry 2019-05-12 10:08:46 -04:00
Bruno Oliveira 63fe547d9f Preparing release version 4.5.0 2019-05-11 16:35:32 +00:00
Bruno Oliveira 465b2d998a
Further "unknown marks warning" improvements (#5178) 
Further "unknown marks warning" improvements
 2019-05-11 13:28:10 -03:00
Bruno Oliveira 73bbff2b74 Introduce record_testsuite_property fixture 
This exposes the functionality introduced in fa6acdc as a session-scoped fixture.

Plugins that want to remain compatible with the `xunit2`
standard should use this fixture instead of `record_property`.

Fix #5202
 2019-05-10 19:44:27 -03:00
Bruno Oliveira 0594dba5ce Remove unused markers and enable --strict-markers 2019-05-09 19:36:39 -03:00
Bruno Oliveira 685ca96c71 Change ``--strict`` to ``--strict-markers``, preserving the old one 
Fix #5023
 2019-05-09 19:36:38 -03:00
Bruno Oliveira ccf6c3cb46 Merge remote-tracking branch 'upstream/master' into merge-master-into-features 2019-05-09 19:22:40 -03:00
Daniel Hahler 73b74c74c9 pdb: only use outcomes.exit via do_quit 
Fixes https://github.com/pytest-dev/pytest/issues/5235.
 2019-05-09 14:55:55 +02:00
Bruno Oliveira 4d782dc13f Add CHANGELOG for #5239 2019-05-09 09:00:39 -03:00
Daniel Hahler 5eeb5ee960
Merge pull request #5013 from blueyed/short-summary-message 
Display message from reprcrash in short test summary
 2019-05-08 22:01:04 +02:00
Pulkit Goyal 7e08e09473 logging: improve default logging format (issue5214) 
We improve the following things in the logging format:

  * Show module name instead of just the filename
  * show level of logging as the first thing
  * show lineno attached to module:file details

Thanks to @blueyed who suggested this on the github issue.

It's my first contribution and I have added myself to AUTHORS.

I also added to a changelog file.
 2019-05-08 21:37:59 +03:00
Bruno Oliveira 3ac43314ee Preparing release version 4.4.2 2019-05-08 12:46:14 -03:00
Romain Chossart 0cf267f187 Add changelog entry for #5229 2019-05-08 16:13:28 +01:00
Bruno Oliveira f339147d12 Add CHANGELOG entry about depending on wcwidth 2019-05-07 19:34:57 -03:00
Bruno Oliveira 6d040370ed Show fixture scopes with ``--fixtures``, except for "function" scope 
Fix #5220
 2019-05-07 14:32:20 -03:00
Bruno Oliveira 4a2fdce62b
Emit a warning for record_property when used with xunit2 (#5204) 
Emit a warning for record_property when used with xunit2
 2019-05-05 21:33:31 -03:00
Bruno Oliveira 8f23e19bcb Emit a warning for record_property when used with xunit2 
"property" elements cannot be children of "testsuite" according to the schema, so it is incompatible with xunit2

Related to #5202
 2019-05-05 09:01:13 -03:00
Bruno Oliveira 9f66102869 Merge remote-tracking branch 'upstream/master' into merge-master-into-features 2019-05-04 10:47:57 -03:00
DamianSkrzypczak 6e81c3df92 add changelog for issue #5171 fixes 2019-05-02 21:30:03 +02:00
Allan Lewis f050203f5d
Improve help for --runxfail flag 
The help for the '--runxfail' flag is somewhat misleading. The default
behaviour is to run tests marked as 'xfail' but to ignore the results. This
flag alters that behaviour by running these tests as if they weren't marked
'xfail', i.e. their results are not ignored.
 2019-05-01 10:04:32 +01:00
Bruno Oliveira fc2ad1dbed
Warning subclasses (#5179) 
Warning subclasses
 2019-04-29 17:57:49 -03:00
Bruno Oliveira fb6dad60a0
terminal: use pytest_collection_finish for reporting (#5113) 
terminal: use pytest_collection_finish for reporting
 2019-04-29 08:00:48 -03:00
Daniel Hahler ff5317a7f3 terminal: use pytest_collection_finish for reporting 2019-04-29 05:20:04 +02:00
Bruno Oliveira 08734bdd18 --lf now skips colletion of files without failed tests 
Fix #5172
 2019-04-28 20:23:46 -03:00
Bruno Oliveira a3c2ec3c5b Add CHANGELOG for #5182 2019-04-28 11:10:21 -03:00
Bruno Oliveira 915ecb0dac Add CHANGELOG for #5177 2019-04-28 10:47:19 -03:00
Daniel Hahler 308b733b9d Revert "Merge pull request #4854 from blueyed/pdb-skip" 
This reverts commit e88aa957ae, reversing
changes made to 1410d3dc9a.

I do not think it warrants an option anymore, and there is a way to
achieve this via `--pdbcls` if needed.
 2019-04-27 02:25:38 +02:00
Daniel Hahler 7f519f8ab7 Merge master into features 2019-04-27 00:43:00 +02:00
Nikolay Kondratyev bc00d0f7db Fix handle repr error with showlocals and verbose output 2019-04-19 18:54:21 +03:00
Daniel Hahler 4749dca764 changelog [ci skip] 2019-04-18 23:54:20 +02:00
Ilya Konstantinov d67d68f6d3 Eliminate core dependency on 'terminal' plugin 2019-04-17 11:19:19 -07:00
Daniel Hahler df1d1105b0 Merge remote-tracking branch 'origin/features' into short-summary-message 
Conflicts:
	src/_pytest/skipping.py
 2019-04-17 15:30:19 +02:00
Anthony Sottile 990133f804
Merge pull request #5132 from nicoddemus/merge-master-into-features 
Merge master into features
 2019-04-15 13:11:33 -07:00
Bruno Oliveira b64d9402ca
Merge pull request #5108 from blueyed/summary 
terminal summary: display passes after warnings
 2019-04-15 14:49:01 -03:00
Bruno Oliveira 8d3a5dcd1b Merge remote-tracking branch 'upstream/master' into merge-master-into-features 2019-04-15 14:47:45 -03:00
Daniel Hahler ea79eb5c3f terminal summary: display passes after warnings 
This displays passes (with output, `-rP`) before the short summary, and
before any other output from other plugins also.
 2019-04-15 16:31:42 +02:00
Bruno Oliveira 006dc30476 Preparing release version 4.4.1 2019-04-15 14:24:17 +00:00
Daniel Hahler 6f0a5789fb Merge master into features 2019-04-14 23:22:21 +02:00
Daniel Hahler 8fd5a658eb monkeypatch.syspath_prepend: invalidate import cache 
This was done with testdir only, and uses the fixed monkeypatch method
there now.
 2019-04-13 16:15:44 +02:00
Anthony Sottile 43e7401c91 Produce a warning when unknown arguments are passed to pytest.param() 2019-04-12 13:00:39 -07:00
Bruno Oliveira 19035f4b55
Merge pull request #5068 from blueyed/reportchars 
Add support for reportchars=A (`-rA`)
 2019-04-12 08:13:22 -03:00
Samuel Searles-Bryant a37d1df089 Show XFail reason as part of JUnitXML message field 
Fixes #4907
 2019-04-11 22:26:05 +01:00
Daniel Hahler 42e60d935a doc/changelog 2019-04-11 11:44:04 +02:00
Daniel Hahler b3759372ad
Merge pull request #5082 from blueyed/pytester-raise_on_kwargs 
pytester: improve/fix kwargs validation
 2019-04-11 00:46:18 +02:00
Bruno Oliveira f5d2b199e2
Merge pull request #5069 from blueyed/cleanup-summary-to-terminal 
cleanup: move terminal summary code to terminal plugin
 2019-04-10 19:32:01 -03:00
Daniel Hahler 12133d4eb7 changelog [ci skip] 2019-04-10 23:15:25 +02:00
Daniel Hahler dde27a2305 changelog [ci skip] 2019-04-10 21:39:51 +02:00
Daniel Hahler 4fca86e2af testdir.popen: use kwargs with defaults for stdout/stderr 2019-04-06 12:13:48 +02:00
Daniel Hahler 9ad00714ba pytester: allow passing in stdin to run/popen 2019-04-06 12:13:28 +02:00
Daniel Hahler 377888140f Merge master into features 
Conflicts:
	testing/test_pdb.py
 2019-04-05 17:50:32 +02:00
Bruno Oliveira 4f33f46a02
Merge pull request #5026 from blueyed/compare-len-diff 
Display number of different items with sequence/dict comparisons
 2019-04-05 08:53:48 -03:00
Daniel Hahler 0f965e57a2 changelog, fix branch coverage 2019-04-05 12:12:29 +02:00
Jeffrey Rackauckas da3f836ee3 Added the junit_log_passing_tests ini flag. 2019-04-04 20:26:48 -07:00
Daniel Hahler 37ecca3ba9 factor out _get_line_with_reprcrash_message 2019-04-04 22:13:28 +02:00
Daniel Hahler eb5b2e0db5 Support glob argument with ``--cache-show`` 2019-04-04 18:10:39 +02:00
Bruno Oliveira e04936fc29
Merge pull request #5042 from blueyed/merge-regen-master-into-features 
Merge master into features (with regen)
 2019-04-04 10:44:30 -03:00
Daniel Hahler 0d4636b056
Merge pull request #5034 from blueyed/run-last-failure-report 
run-last-failure: improve reporting
 2019-04-04 00:40:40 +02:00
Daniel Hahler 757ada2fd2 pdb: try to import --pdbcls in pytest_configure only 
Fixes https://github.com/pytest-dev/pytest/issues/5039.
 2019-04-03 22:35:18 +02:00
Daniel Hahler e88aa957ae
Merge pull request #4854 from blueyed/pdb-skip 
pdb: add option to skip `pdb.set_trace()`
 2019-04-03 22:25:38 +02:00
Daniel Hahler 8907fedc79 Merge master into features (with regen branch) 2019-04-03 22:11:00 +02:00
Daniel Hahler 1f5a61e4ef run-last-failure: improve reporting 2019-04-03 16:27:12 +02:00
Daniel Hahler d91527599a pytester: use monkeypatch with Testdir 2019-04-03 15:02:53 +02:00
Bruno Oliveira 15ea5cef46
Merge pull request #4943 from blueyed/remove-silence_logging_at_shutdown 
capture: do not set logging.raiseExceptions = False
 2019-04-02 22:46:15 -03:00
Daniel Hahler 08ded2927a capture: do not set logging.raiseExceptions = False 
Ref: https://github.com/pytest-dev/pytest/issues/4942
 2019-04-02 13:20:39 +02:00
Zac Hatfield-Dodds 9121138a1b Emit warning for unknown marks 2019-04-01 10:40:18 +11:00
Zac-HD bcc08ffe4d More docs on registering marks 2019-03-31 14:22:30 +11:00
Bruno Oliveira 8881b201aa Preparing release version 4.4.0 2019-03-29 20:49:18 +00:00
Bruno Oliveira 278b289f37
Merge pull request #4968 from blueyed/pdb-do_debug-quit 
pdb: do not raise outcomes.Exit with quit in debug
 2019-03-29 16:22:02 -03:00
Daniel Hahler e7ade066b6
Merge pull request #5011 from blueyed/merge-master-into-features 
Merge master into features
 2019-03-29 18:35:13 +01:00
Daniel Hahler adebfd0a84 pdb: add option to skip `pdb.set_trace()` 2019-03-29 11:13:38 +01:00
Daniel Hahler 4e931b258d Merge master into features 2019-03-29 11:05:46 +01:00
Daniel Hahler 4011021823 pdb: do not raise outcomes.Exit with quit in debug 2019-03-29 11:02:34 +01:00
Daniel Hahler bfda2a0050 setup.cfg: use existing [tool:pytest] (ignoring [pytest]) 2019-03-29 10:59:27 +01:00
Bruno Oliveira 6b5cddc48a
Merge pull request #4951 from blueyed/fix-pdb-capfix 
pdb: handle capturing with fixtures only
 2019-03-28 20:34:28 -03:00
Gary Tyler 403f556928 Update docs for 'pytest_cmdline_parse' hook to note availability liminations 2019-03-28 19:25:55 -04:00
Bruno Oliveira d8ef86aadf
Merge pull request #4993 from blueyed/stepwise-report 
stepwise: report status via pytest_report_collectionfinish
 2019-03-28 20:24:18 -03:00
Bruno Oliveira a9fe1e159a
Merge pull request #4965 from nicoddemus/serialization-hooks 
Serialization hooks
 2019-03-28 20:22:19 -03:00
Bruno Oliveira 65c8e8a09e Rename hooks: to/from_serializable 2019-03-28 13:41:56 -03:00
Daniel Hahler 46d9243eb0 changelog 2019-03-28 11:56:53 +01:00
Daniel Hahler c92021fc4f
Merge pull request #5003 from blueyed/off 
Fix off-by-one error with lineno in mark collection error
 2019-03-28 00:09:53 +01:00
Daniel Hahler 76c70cbf4c Fix off-by-one error with lineno in mark collection error 2019-03-27 17:44:52 +01:00
Jeong YunWon 8b0b7156d9 Fix glitches of original patch of disable-test-id-escaping 2019-03-28 00:07:28 +09:00
ApaDoctor cf6e2ceafd add ini option to disable string escape for parametrization 2019-03-28 00:07:28 +09:00
Bruno Oliveira 241b7433cd
Merge pull request #4978 from blueyed/exit-from-from_assertrepr_compare 
Do not swallow outcomes.Exit in assertrepr_compare
 2019-03-26 18:39:13 -03:00
Bruno Oliveira 057c97812b
Merge pull request #4975 from blueyed/verbose-fixes 
Fix usages of "verbose" option
 2019-03-26 18:38:39 -03:00
Bruno Oliveira 02188e399d
Merge pull request #4987 from blueyed/collect-tbstyle-repr_failure 
CollectError.repr_failure: honor explicit tbstyle option
 2019-03-26 18:37:49 -03:00
Daniel Hahler 538efef1ba logging: close log_file_handler 
While it should be closed in logging's shutdown [1], the following would
still issue a ResourceWarning:

```
import logging

log_file_handler = logging.FileHandler("temp.log", mode="w", encoding="UTF-8")

root_logger = logging.getLogger()
root_logger.addHandler(log_file_handler)
root_logger.removeHandler(log_file_handler)
root_logger.error("error")

del log_file_handler
```

It looks like the weakref might get lost for some reason.

See https://github.com/pytest-dev/pytest/pull/4981/commits/92ffe42b45 / #4981
for more information.

1: c1419578a1/Lib/logging/__init__.py (L2107-L2139)
 2019-03-26 18:24:19 +01:00
Daniel Hahler 94a2e3dddc stepwise: report status via pytest_report_collectionfinish 2019-03-26 13:20:33 +01:00
Daniel Hahler e1ae469504 Merge master into features 2019-03-26 10:23:21 +01:00
Daniel Hahler 0d00be4f4f Do not swallow outcomes.Exit in assertrepr_compare 2019-03-26 10:20:00 +01:00
Daniel Hahler 23146e7527 Fix usages of "verbose" option 
With `-qq` `bool(config.getoption("verbose"))` is True; it needs to be
checked for `> 0`.
 2019-03-26 10:11:25 +01:00
Daniel Hahler b18df936ea changelog 2019-03-26 10:06:53 +01:00
Bruno Oliveira 645774295f Add CHANGELOG 2019-03-25 20:16:59 -03:00
Daniel Hahler 5df45f5b27 Use fixup_namespace_packages also with pytester.syspathinsert 2019-03-22 17:02:26 +01:00
Daniel Hahler 475119988c monkeypatch.syspath_prepend: call fixup_namespace_packages 
Without the patch the test fails as follows:

            # Prepending should call fixup_namespace_packages.
            monkeypatch.syspath_prepend("world")
    >       import ns_pkg.world
    E       ModuleNotFoundError: No module named 'ns_pkg.world'
 2019-03-22 15:29:08 +01:00
Daniel Hahler 7939e5327c
Merge pull request #4957 from blueyed/config-handle-pno-with-default-plugins 
config: handle `-p no:plugin` with default plugins
 2019-03-20 03:32:03 +01:00
Daniel Hahler 415899d428 config: handle `-p no:plugin` with default plugins 
`-p no:capture` should not load its fixtures in the first place.
 2019-03-20 02:47:13 +01:00
Daniel Hahler 8dda5613ef
Merge pull request #4956 from blueyed/home2 
pytester: set HOME only with inline_run/popen
 2019-03-20 02:29:29 +01:00
Daniel Hahler 714f2113bb
Merge pull request #4929 from blueyed/fix-_factorytraceback-offset 
Fix line offsets with `ScopeMismatch` errors
 2019-03-20 01:30:58 +01:00
Daniel Hahler a50b92ea67 pytester: set HOME only with inline_run/popen 
Ref: https://github.com/pytest-dev/pytest/issues/4955
 2019-03-20 01:15:51 +01:00
Bruno Oliveira 23ab43233e
Merge pull request #4920 from nicoddemus/subtests-pytest-1367 
Internal refactorings required for *external* pytest-subtests plugin
 2019-03-19 18:57:11 -03:00
Bruno Oliveira 1a119a22d1 Internal refactorings in order to support the new pytest-subtests plugin 
Related to #1367
 2019-03-19 18:20:41 -03:00
Daniel Hahler 751c061d9a Merge master into features 2019-03-19 01:07:10 +01:00
Daniel Hahler a624b84097
Merge pull request #4941 from blueyed/testdir-home 
pytester: testdir: set $HOME to tmpdir
 2019-03-18 23:02:15 +01:00
Daniel Hahler c75dd10671 pytester: testdir: set $HOME to tmpdir 
This avoids loading user configuration, which might interfere with test
results, e.g. a `~/.pdbrc.py` with pdb++.

Also sets USERPROFILE, which will be required with Python 3.8 [1].

1: https://bugs.python.org/issue36264
 2019-03-18 20:55:39 +01:00
Daniel Hahler 15fe8c6e90 Handle `-p plug` after `-p no:plug`. 
This can be used to override a blocked plugin (e.g. in "addopts") from the
command line etc.
 2019-03-16 15:58:00 +01:00
Daniel Hahler 5e27ea5528 pytester: LineMatcher: assert Sequence when matching in order 
This can be helpful when passing a set accidentally.
 2019-03-15 23:07:08 +01:00
Bruno Oliveira 33d4c96aa2
Merge pull request #4830 from nicoddemus/warn-on-coroutine 
Emit a warning when a coroutine test function is encountered
 2019-03-15 09:51:34 -03:00
Miro Hrončok 2af0a023c9 Pin sphinx-removed-in to >= 0.2.0 to support Sphinx 2.0 
Fixes https://github.com/pytest-dev/pytest/issues/4912
 2019-03-15 10:56:13 +01:00
Daniel Hahler 57be1d60dd
Apply suggestions from code review 
Co-Authored-By: tkf <takafumi.a@gmail.com>
 2019-03-15 11:29:16 +09:00
Takafumi Arakaki 62f96eea6b Include documentation 2019-03-15 11:14:50 +09:00
Daniel Hahler d441fa66fe Fix line offsets with `ScopeMismatch` errors 
Fixes https://github.com/pytest-dev/pytest/issues/4928.
 2019-03-15 02:47:33 +01:00
Daniel Hahler 7afe17740f Merge master into features 2019-03-15 00:52:12 +01:00
Bruno Oliveira 40072b9511 Emit a warning when a async def function is not handled by a plugin 
Fix #2224
 2019-03-14 20:22:23 -03:00
Miro Hrončok 134b957bf4 Remove deprecated Sphinx directive add_description_unit() 
Partial solution for https://github.com/pytest-dev/pytest/issues/4912
 2019-03-14 12:16:59 +01:00
Bruno Oliveira 74416525d2
Merge pull request #4903 from bmwiedemann/y2038 
Allow tests to pass after 2038
 2019-03-13 20:07:25 -03:00
Bruno Oliveira 44cb51010c Improve CHANGELOG and code comment 2019-03-13 18:52:30 -03:00
Bruno Oliveira 47bd1688ed Remove dead-code related to yield tests 
Just noticed some code that no longer is needed when we removed yield-tests
 2019-03-12 20:10:59 -03:00
Daniel Hahler 6630d96253
Merge pull request #4914 from hroncok/issue4913 
Fix pytest tests invocation with custom PYTHONPATH
 2019-03-12 18:58:54 +01:00
Miro Hrončok d32ab6029f Fix pytest tests invocation with custom PYTHONPATH 
Fixes https://github.com/pytest-dev/pytest/issues/4913

Co-authored-by: Bruno Oliveira <nicoddemus@gmail.com>
 2019-03-12 17:31:42 +01:00
Bruno Oliveira 492cc4219c Prepare release 4.3.1 2019-03-11 12:59:54 -03:00
Bernhard M. Wiedemann 489c61a22d Allow tests to pass after 2038 
without this change, the python-apache-libcloud tests failed
in the year 2039 with

     fp.write(struct.pack("<ll", mtime, size))
 E   error: 'l' format requires -2147483648 <= number <= 2147483647
 2019-03-10 05:22:21 +01:00
Bruno Oliveira a0f652c559
Rename 4898.trivial.rst to 4898.bugfix.rst 2019-03-08 22:41:57 -03:00
Bruno Oliveira 877b57ae9b
Add CHANGELOG entry 2019-03-08 22:33:07 -03:00
Daniel Hahler c86d2daf81 pytester: remove unused anypython fixture 
This became unused after ab9f6a75 (in 2009).
 2019-03-06 17:42:21 +01:00
Daniel Hahler 236bada755
Merge pull request #4768 from horta/avoid-pkg_resources 
Avoid pkg_resources import at the top-level.
 2019-03-05 23:02:02 +01:00
Daniel Hahler 76687030f0 Merge branch 'master' into merge-master-into-features 
Conflicts:
	appveyor.yml
	setup.py
 2019-03-05 19:07:36 +01:00
Bruno Oliveira 23ea04f910
Merge pull request #4860 from nicoddemus/getfixturevalue-cleanup-1895 
getfixturevalue does not correctly declare dependency with the calling fixture
 2019-03-03 15:56:45 -03:00
Bruno Oliveira 0deb7b1696 Do not show "inifile:" string if there's no configuration file 2019-03-02 11:45:08 -03:00
Bruno Oliveira 53b8aa065c Show testpaths option in the header if it has been used for collection 
Fix #4875
 2019-03-02 11:35:32 -03:00
Bruno Oliveira d97473e551 Add test and CHANGELOG for #1895 2019-03-02 09:39:30 -03:00
Daniel Hahler db5cc35b44 pytester: unset PYTEST_ADDOPTS 2019-03-01 18:43:17 +01:00
Daniel Hahler f7a3e001f7 pdb: allow for --pdbclass=mod:attr.class 2019-03-01 15:20:04 +01:00
Bruno Oliveira 33db5e081d
Tweak changelog 2019-03-01 10:09:29 -03:00
Daniel Hahler a51dc0c7ce Validate type with writing to captured output like without 
Fixes https://github.com/pytest-dev/pytest/issues/4861.
 2019-03-01 14:03:51 +01:00
Bruno Oliveira 2cf1de3f2d
Merge pull request #4727 from nicoddemus/early-load-4718 
Change -p so it is possible to early load setuptools plugins
 2019-02-25 10:05:51 -03:00
Bruno Oliveira a0207274f4 -p option now can be used to early-load plugins by entry-point name 
Fixes #4718
 2019-02-24 13:20:17 -03:00
Bruno Oliveira ede6387caa Require funcsigs>=1.0 on Python 2.7 
Fix #4815
 2019-02-24 12:11:08 -03:00
Andras Mitzki b26b731498 Logging: Make pytest_runtest_logreport() available for logging 
Signed-off-by: Andras Mitzki <andras.mitzki@balabit.com>
 2019-02-22 05:14:44 +01:00
Bruno Oliveira 31c869b4c4 Preparing release version 4.3.0 2019-02-16 14:11:58 +00:00
Bruno Oliveira 0395996756 Merge remote-tracking branch 'upstream/master' into release-4.3.0 2019-02-16 14:06:51 +00:00
Bruno Oliveira 986dd84375
LoggingPlugin: Support to customize log_file from hook (#4752) 
LoggingPlugin: Support to customize log_file from hook
 2019-02-16 12:01:21 -02:00
Andras Mitzki e3824d23bc LoggingPlugin: Expose setting log_file_handler 
- This patch allows to set log_file (path) from hook

Signed-off-by: Thomas Hisch
Signed-off-by: Andras Mitzki <andras.mitzki@balabit.com>
 2019-02-15 16:05:10 +01:00
Daniel Hahler 407d4a0cf0 collect: python: fix `AssertionError` with broken symlinks 
Fixes https://github.com/pytest-dev/pytest/issues/4782.
 2019-02-14 00:18:14 +01:00
Daniel Hahler 7b91952645 Merge master into features 
Conflicts:
	tox.ini
 2019-02-13 17:58:16 +01:00
Anthony Sottile f672b7e39e
Merge pull request #4773 from nicoddemus/remove-py27-py34-deprecation-warning 
Remove py27 py34 deprecation warning
 2019-02-12 21:42:07 -05:00
Bruno Oliveira 82cc3d8cc2 Preparing release version 4.2.1 2019-02-12 20:17:06 +00:00
Bruno Oliveira e20e376881
Merge pull request #4347 from blueyed/pdb-recursive-capture 
pdbpp: fix capturing with recursive debugging
 2019-02-12 16:53:14 -02:00
Sam Brightman a8003286b5 Add CHANGELOG entry for #4770 2019-02-12 13:32:06 +00:00