Bruno Oliveira
832b59b316
Merge pull request #4312 from Lothiraldan/patch-1
...
Add missing `-` in front of the new option `--sw`
2018-11-05 17:17:15 -03:00
Boris Feld
d42c490bc1
Add missing `-` in front of the new option `--sw`
2018-11-05 15:39:35 +01:00
Ronny Pfannschmidt
e253852e4b
Merge pull request #4309 from asottile/less_unicode_hax
...
Use unicode/bytes literals instead of calls
2018-11-05 07:17:13 +01:00
Anthony Sottile
a4819844a4
Use unicode/bytes literals instead of calls
2018-11-04 17:43:24 -08:00
Anthony Sottile
db996335c8
Merge pull request #4302 from jdufresne/pypi
...
Update pypi.python.org reference to pypi.org
2018-11-04 17:32:56 -08:00
Anthony Sottile
4bf6a07fe2
Merge pull request #4305 from RonnyPfannschmidt/cleanup-tobytes
...
replace byte/unicode helpers in test_capture with python level syntax
2018-11-04 17:29:41 -08:00
Bruno Oliveira
4aa3c4fa2b
Merge pull request #4303 from blueyed/fix-changelog
...
doc: add lost changelog entry
2018-11-04 20:21:06 -03:00
Ronny Pfannschmidt
7cb271b46f
replace byte/unicode helpers in test_capture with python level syntax
2018-11-04 22:01:01 +01:00
Daniel Hahler
34152445cf
doc: add lost changelog entry
...
Closes https://github.com/pytest-dev/pytest/issues/4300 .
[ci skip]
2018-11-04 18:26:09 +01:00
Jon Dufresne
5e0441d96e
Update pypi.python.org reference to pypi.org
2018-11-04 09:02:54 -08:00
Bruno Oliveira
d1c9c54571
Merge pull request #4297 from nicoddemus/release-3.10.0
...
Release 3.10.0
2018-11-04 12:25:30 -03:00
Bruno Oliveira
bb2ed2f898
Merge pull request #4298 from blueyed/howto
...
doc: fix HOWTORELEASE.rst
2018-11-03 20:32:54 -03:00
Bruno Oliveira
3d88d1827b
Fixed linting
2018-11-03 19:50:19 -03:00
Daniel Hahler
7b5f3fe83a
doc: fix HOWTORELEASE.rst
...
Remove last step, because it was merged already before (changed in
77cad3c4
).
[ci skip]
2018-11-03 21:26:08 +01:00
Daniel Hahler
f2b9bbdd4a
Merge pull request #4287 from blueyed/pdb-unconfigure-twice
...
debugging: make pytest_configure re-entrant
2018-11-03 21:09:13 +01:00
Bruno Oliveira
c2e906ec97
Preparing release version 3.10.0
2018-11-03 13:51:39 +00:00
Bruno Oliveira
1ec6805112
Fix escape in code sample
2018-11-03 13:48:10 +00:00
Bruno Oliveira
6befdf8b46
Merge remote-tracking branch 'upstream/master' into release-3.10.0
2018-11-03 13:42:20 +00:00
Bruno Oliveira
4cb838d978
Merge pull request #4237 from boxed/master
...
Performance fixes
2018-11-03 10:39:29 -03:00
Daniel Hahler
e61e81a7b5
Make debugging's pytest_configure re-entrant
...
This is relevant when using runpytest in-process.
Fixes:
E def test_1(testdir):
E testdir.runpytest()
E > __import__('pdb').set_trace()
E
E ../../test_trace_after_runpytest.py:3:
E …/Vcs/pytest/src/_pytest/debugging.py:81: in set_trace
E tw = _pytest.config.create_terminal_writer(cls._config)
E
E config = None, args = (), kwargs = {}, tw = <py._io.terminalwriter.TerminalWriter object at 0x7f1097088160>
E
E def create_terminal_writer(config, *args, **kwargs):
E """Create a TerminalWriter instance configured according to the options
E in the config object. Every code which requires a TerminalWriter object
E and has access to a config object should use this function.
E """
E tw = py.io.TerminalWriter(*args, **kwargs)
E > if config.option.color == "yes":
E E AttributeError: 'NoneType' object has no attribute 'option'
2018-11-02 18:25:01 +01:00
Daniel Hahler
023e1c78df
paths: use set and isdisjoint
...
Time: 5.36s => 4.85s (before rebase: 4.45s => 3.55s)
2018-11-02 17:43:04 +01:00
Daniel Hahler
6ffa347c77
Handle dirs only once
...
Time: 5.73s/5.88s => 5.36s
(Before rebase: 4.86s => 4.45s)
2018-11-02 17:43:04 +01:00
Anders Hovmöller
2b50911c9d
Minor refactor for readability
...
Time: 5.73s => 5.88s/5.82s
2018-11-02 17:42:53 +01:00
Anders Hovmöller
a41820fbf0
collection: performance: use optimized parts function
...
Time: 8.53s => 5.73s
2018-11-02 17:42:53 +01:00
Bruno Oliveira
21725e9304
Merge pull request #4285 from kchmck/fix-4046
...
Fix problems with running tests in package `__init__` files (#4046 )
2018-11-02 08:26:07 -03:00
Bruno Oliveira
48f52b1be0
Merge pull request #4279 from williamjamir/improve-warning-msg
...
Improve the warning message for the implicitly str conversion
2018-11-02 08:22:15 -03:00
Daniel Hahler
a5b3ad2e45
Merge pull request #4284 from blueyed/test-dunder-class
...
python: collect: ignore exceptions with isinstance
2018-11-01 22:15:29 +01:00
Daniel Hahler
e30f7094f3
python: collect: ignore exceptions with isinstance
...
Fixes https://github.com/pytest-dev/pytest/issues/4266 .
2018-11-01 22:14:13 +01:00
Mick Koch
5197354375
Add changelog entry
2018-11-01 13:13:33 -04:00
Mick Koch
5ac4eff09b
Fix __init__.py as argument also including other package files
2018-11-01 13:10:52 -04:00
Mick Koch
320e41b142
Add failing test for __init__.py also including other package files
2018-11-01 13:10:52 -04:00
Mick Koch
70976b04be
Add test for __init__.py collection with package directory as argument
2018-11-01 13:10:17 -04:00
Daniel Hahler
d65f300988
Move handling of duplicate files
...
This removes the hack added in https://github.com/pytest-dev/pytest/pull/3802 .
Adjusts test:
- it appears to not have been changed to 7 intentionally.
- removes XXX comment, likely not relevant anymore since 6dac7743
.
2018-11-01 13:06:36 -04:00
Anthony Sottile
948fd7b8b0
fixup pyupgrade crlf incorrect fixes
2018-11-01 08:40:35 -07:00
Bruno Oliveira
f2cebce2eb
Merge pull request #4272 from blueyed/cache-non-default
...
cacheprovider: display cachedir also in non-verbose mode if customized
2018-11-01 12:19:21 -03:00
Daniel Hahler
a192e6b430
Merge pull request #4247 from blueyed/lru
...
_getconftestmodules: use functools.lru_cache
2018-11-01 15:55:38 +01:00
Daniel Hahler
f8a2452247
changelog [ci skip]
2018-11-01 15:53:31 +01:00
Bruno Oliveira
56e6bb0ff6
Merge pull request #4282 from avallbona/patch-1
...
Update talks.rst
2018-10-31 22:33:45 -03:00
Bruno Oliveira
017e504a11
Merge pull request #4277 from blueyed/pdb-set_trace-capture-msg
...
pdb: improve msg about output capturing with set_trace
2018-10-31 21:48:47 -03:00
Andreu Vallbona Plazas
9871d5ec2d
Updated the talks.rst
...
corrected the target name
2018-11-01 01:24:18 +01:00
Bruno Oliveira
642521a9b3
Merge pull request #4281 from asottile/bump_hooks
...
Upgrade pyupgrade for crlf fixes (again)
2018-10-31 20:58:05 -03:00
Bruno Oliveira
0994829afe
Move pytest talk to the start of the section
2018-10-31 19:35:47 -03:00
Daniel Hahler
ce1cc3dddb
_getconftestmodules: use functools.lru_cache
...
Also renames `_path2confmods` to `_dirpath2confmods` for clarity (it is
expected to be a dirpath in `_importconftest`).
Uses an explicit maxsize, since it appears to be only relevant for a
short period [1].
Removes the lru_cache on _getconftest_pathlist, which makes no
difference when caching _getconftestmodules, at least with the
performance test of 100x10 files (#4237 ).
1: https://github.com/pytest-dev/pytest/pull/4237#discussion_r228528007
2018-10-31 23:17:05 +01:00
Daniel Hahler
65817dd797
changelog [ci skip]
2018-10-31 23:13:25 +01:00
Andreu Vallbona Plazas
c31abb1176
Update talks.rst
...
Added the slides of a PyconES 2017 talk about pytest and its plugins ecosystem.
2018-10-31 23:06:44 +01:00
Bruno Oliveira
d4ca634ef6
Fix linting
2018-10-31 18:21:55 -03:00
Anthony Sottile
af00367fed
Upgrade pyupgrade for crlf fixes (again)
2018-10-31 13:26:49 -07:00
William Jamir Silva
9b94313b44
Update changelog
2018-10-31 17:12:50 -03:00
William Jamir Silva
5404246e64
Improve the warning message for the implicitly str conversion
...
Signed-off-by: William Jamir Silva <williamjamir@gmail.com>
2018-10-31 16:19:10 -03:00
Daniel Hahler
e0038b82f7
pdb: improve msg about output capturing with set_trace
...
Do not display "IO-capturing turned off/on" when ``-s`` is used to avoid
confusion.
2018-10-31 17:09:01 +01:00