415fcb912b
Travis: use TOXENV=linting for linting stage
...
This will run it with `--show-diff-on-failure` then, and helps to keep
it in line / in a central place.
2018-08-25 23:14:09 +02:00
be4b359c74
Merge pull request #3861 from jonozzz/fix-3854
...
Fix #3854
2018-08-25 10:44:08 -03:00
72a58bbafe
Merge pull request #3871 from schmamps/cmdclass
...
Correct cmdclass for doc: Good Integration Practices
2018-08-24 22:09:35 -03:00
c336449729
Make linting happy. Argh.
2018-08-24 18:05:35 -07:00
1e4ecda884
Fix the package fixture ordering in Windows.
2018-08-24 18:01:38 -07:00
8cf0e46bbf
test_package_ordering: Collect *.py, but keep a mix of case for filenames. The test doesn't make sense for Windows, because of its case-insensitivity.
2018-08-24 16:23:50 -07:00
f0226e9329
Fix test_package_ordering on Windows
2018-08-24 20:15:33 -03:00
dce8df45d5
Added changelog items.
2018-08-24 15:51:42 -07:00
f6948597e4
add to changelog
2018-08-24 12:29:18 -07:00
e3df1031ca
Add encoding: utf8 for python 2.7
2018-08-24 12:26:18 -07:00
14ffadf004
correct cmdclass
2018-08-24 12:07:22 -07:00
459b040d21
Fix dedent after merge.
2018-08-24 11:54:04 -07:00
3396225f74
Merge branch 'master' of github.com:pytest-dev/pytest into fix-3854
2018-08-24 11:47:24 -07:00
c82906105c
Merge pull request #3865 from GandalfSaxe/patch-1
...
Move information on `pip install -e` to the top
2018-08-24 07:28:51 -03:00
4c14740798
Merge pull request #3868 from asottile/bytes_py26_plus
...
Use `bytes` directly instead of `binary_type`
2018-08-23 23:16:59 -07:00
72e6482994
Make linting happy.
2018-08-23 22:58:36 -07:00
5f8b50c094
Address #3796 and add a test for it.
2018-08-23 22:48:44 -07:00
99e31f6fb1
Use `bytes` directly instead of `binary_type`
...
`bytes` is an alias for `str` in python2.6+
2018-08-23 18:55:21 -07:00
f2e35c8c4f
Merge pull request #3859 from asottile/pyupgrade_1_4
...
Some pyupgrade 1.4.x changes
2018-08-23 18:32:53 -07:00
40b4fe64af
Fix linting
2018-08-23 22:11:17 -03:00
d10d59c013
Merge pull request #3858 from mimi1vx/test_mock
...
Use unittest.mock if is only aviable
2018-08-23 19:02:39 -03:00
d54aa8ce13
Merge pull request #3848 from wimglenn/pytester_unicode_bugfixes
...
fixed a bunch of unicode bugs in pytester.py
2018-08-23 13:45:49 -05:00
52fa8c98bb
Merge pull request #3864 from asottile/source_to_dedent
...
Replace Source with dedent where possible
2018-08-23 10:45:11 -07:00
3f336869e2
Move information on `pip install -e` to the top
...
Should fix complaints in #2421 .
2018-08-23 18:07:28 +02:00
85482d575e
Replace Source with dedent where possible
2018-08-23 09:06:17 -07:00
6f7365509d
Merge pull request #3860 from asottile/purge_more_py
...
Purge more usage of `py` module
2018-08-23 06:05:32 -03:00
7099ea9bb0
py.builtin._reraise -> six.reraise
2018-08-22 23:00:58 -07:00
dccac69d82
py.builtin.text -> six.text_type
2018-08-22 23:00:06 -07:00
c2cd337886
py.builtin.exec_ => six.exec_
2018-08-22 23:00:06 -07:00
0fc4a806e5
py.builtins._totext -> string literals or six.text_type
2018-08-22 23:00:04 -07:00
4d3c1ab4f0
Fixes #3854
2018-08-22 21:42:59 -07:00
e4f76f6350
Merge branch 'master' of github.com:pytest-dev/pytest into fix-3854
2018-08-22 20:36:52 -07:00
0d65783dce
Fix unicode errors when changing to .format(...)
2018-08-22 19:00:43 -07:00
8bb8b91357
pyupgrade 1.4: tests
2018-08-22 18:47:21 -07:00
8804c7333a
Fix CHANGELOG formatting
2018-08-22 20:06:13 -03:00
17eec5b97e
Merge pull request #3856 from jennirinker/master
...
Resolving Issue #3824
2018-08-22 19:03:55 -03:00
cd07c4d4ff
Use unittest.mock if is only aviable
...
from Python 3.3 is mock part of python standard library in unittest namespace
2018-08-22 23:49:40 +02:00
917b99e438
More unicode whack-a-mole
...
It seems pytest's very comprehensive CI sniffed out a few other places with similar bugs. Ideally we should find all the places where args are not stringy and solve it at the source, but who knows how many people are relying on the implicit string conversion. See [here](https://github.com/pytest-dev/pytest/blob/master/src/_pytest/config/__init__.py#L160-L166 ) for one such problem area (args with a single py.path.local instance is converted here, but a list or tuple containing some are not).
2018-08-22 13:40:21 -05:00
b08e156b79
strip trailing whitespace
2018-08-22 11:27:36 -05:00
8e2c7b4979
Add a failing testcase for PR #3848
2018-08-22 11:00:51 -05:00
5a7aa123ea
Improve docs formatting
2018-08-22 11:22:30 -03:00
a12eadd9ef
resolving Issue #3824 - expanding docs
2018-08-22 15:37:35 +02:00
2137e2b15b
Merge pull request #3846 from nicoddemus/issue-3843
...
Fix collection error when tests is specified with --doctest-modules
2018-08-22 08:17:07 -03:00
89446af51e
fixed a bunch of unicode bugs in pytester.py
2018-08-22 01:30:23 -05:00
3b521bedf8
Merge pull request #3841 from sankt-petersbug/fix-3816
...
Fix '--show-capture=no' capture teardown logs
2018-08-22 07:16:53 +02:00
5b2c8fa007
Merge pull request #3845 from natanlao/patch-1
...
Remove warning about #568 from documentation
2018-08-22 07:12:40 +02:00
eb8d145195
Add link to issue in the CHANGELOG entry
2018-08-21 21:08:21 -03:00
80bea79512
Add changelog entry
2018-08-21 17:04:56 -07:00
07a560ff24
Fix collection error when tests is specified with --doctest-modules
...
The problem was that _matchnodes would receive two items: [DoctestModule, Module]. It would then collect the first one, *cache it*, and fail to match against the name in the command line. Next, it would reuse the cached item (DoctestModule) instead of collecting the Module which would eventually find the "test" name on it.
Added the type of the node to the cache key to avoid this problem, although I'm not a big fan of caches that have different key types.
Fix #3843
2018-08-21 21:02:46 -03:00
717775a1c6
Remove warning about #568 from documentation
...
The documentation (https://docs.pytest.org/en/latest/skipping.html ) references
issue #568 , which has since been fixed.
2018-08-21 16:57:33 -07:00
Daniel Hahler
Bruno Oliveira
turturica
Andrew Champion
Anthony Sottile
wim glenn
Gandalf Saxe
Ondřej Súkup
Jennifer Rinker
wim glenn
Ronny Pfannschmidt
Natan Lao