Bruno Oliveira
70bdacf01a
Fix collection example docs
2018-08-26 12:58:47 +00:00
Bruno Oliveira
b69f853acb
Tweak CHANGELOG for 3.7.3
2018-08-26 09:46:46 -03:00
Bruno Oliveira
c31018d9bc
Preparing release version 3.7.3
2018-08-26 12:43:43 +00:00
Bruno Oliveira
7ae23901d3
Merge pull request #3881 from GandalfSaxe/patch-2
...
Code block: :: missing and 4 spaces instead of 5
2018-08-26 09:22:30 -03:00
Bruno Oliveira
4d19b94347
Merge pull request #3877 from blueyed/codecov-master
...
tox: coveralls: also report to codecov
2018-08-26 09:19:03 -03:00
Bruno Oliveira
c15b537e3d
Merge pull request #3878 from asottile/skip_install_linting
...
Use skip_install for testing tox env
2018-08-26 09:17:40 -03:00
Bruno Oliveira
2577a6ce8a
Merge pull request #3873 from nicoddemus/sys-path-fix
...
Remove dangerous sys.path manipulations in test_pluginmanager
2018-08-26 08:53:57 -03:00
Bruno Oliveira
dd5f5ca4cb
Merge pull request #3872 from nicoddemus/tests-in-init-files
...
Collect tests from __init__.py files if they match 'python_files'
2018-08-26 08:50:17 -03:00
Gandalf Saxe
508774742e
Code block: :: missing and 4 spaces instead of 5
...
I just noticed the newly committed code block doesn't format as a code block without `::` in the paragraph before. Perhaps doesn't make a difference, but also corrected 5 spaces to 4 which seems standard.
2018-08-26 11:54:08 +02:00
Daniel Hahler
d3f5324386
tox: coveralls: also report to codecov
...
This is meant to get base coverage on master for codecov.
2018-08-26 02:14:22 +02:00
Anthony Sottile
3da88d794f
Use skip_install for testing tox env
2018-08-25 16:48:01 -07:00
Bruno Oliveira
71b4995775
Merge pull request #3874 from blueyed/improve-pre-commit
...
Travis: use TOXENV=linting for linting stage
2018-08-25 20:14:27 -03:00
Bruno Oliveira
b0541e9d31
Correctly restore sys.path in test and remove dead code in test_pytester
...
The code in test_pytester has been refactored into a class right
above the dead code, and the code has been left there by mistake
apparently.
2018-08-25 18:17:52 -03:00
Daniel Hahler
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
Bruno Oliveira
f872fcb5d0
Remove dangerous sys.path manipulations in test_pluginmanager
...
Noticed these while working in something else
2018-08-25 17:33:29 -03:00
Bruno Oliveira
de6f2c0336
Collect tests from __init__.py files if they match 'python_files'
...
Fix #3773
2018-08-25 11:18:52 -03:00
Bruno Oliveira
be4b359c74
Merge pull request #3861 from jonozzz/fix-3854
...
Fix #3854
2018-08-25 10:44:08 -03:00
Bruno Oliveira
72a58bbafe
Merge pull request #3871 from schmamps/cmdclass
...
Correct cmdclass for doc: Good Integration Practices
2018-08-24 22:09:35 -03:00
turturica
c336449729
Make linting happy. Argh.
2018-08-24 18:05:35 -07:00
turturica
1e4ecda884
Fix the package fixture ordering in Windows.
2018-08-24 18:01:38 -07:00
turturica
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
Bruno Oliveira
f0226e9329
Fix test_package_ordering on Windows
2018-08-24 20:15:33 -03:00
turturica
dce8df45d5
Added changelog items.
2018-08-24 15:51:42 -07:00
Andrew Champion
f6948597e4
add to changelog
2018-08-24 12:29:18 -07:00
turturica
e3df1031ca
Add encoding: utf8 for python 2.7
2018-08-24 12:26:18 -07:00
Andrew Champion
14ffadf004
correct cmdclass
2018-08-24 12:07:22 -07:00
turturica
459b040d21
Fix dedent after merge.
2018-08-24 11:54:04 -07:00
turturica
3396225f74
Merge branch 'master' of github.com:pytest-dev/pytest into fix-3854
2018-08-24 11:47:24 -07:00
Bruno Oliveira
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
Anthony Sottile
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
turturica
72e6482994
Make linting happy.
2018-08-23 22:58:36 -07:00
turturica
5f8b50c094
Address #3796 and add a test for it.
2018-08-23 22:48:44 -07:00
Anthony Sottile
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
Anthony Sottile
f2e35c8c4f
Merge pull request #3859 from asottile/pyupgrade_1_4
...
Some pyupgrade 1.4.x changes
2018-08-23 18:32:53 -07:00
Bruno Oliveira
40b4fe64af
Fix linting
2018-08-23 22:11:17 -03:00
Bruno Oliveira
d10d59c013
Merge pull request #3858 from mimi1vx/test_mock
...
Use unittest.mock if is only aviable
2018-08-23 19:02:39 -03:00
wim glenn
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
Anthony Sottile
52fa8c98bb
Merge pull request #3864 from asottile/source_to_dedent
...
Replace Source with dedent where possible
2018-08-23 10:45:11 -07:00
Gandalf Saxe
3f336869e2
Move information on `pip install -e` to the top
...
Should fix complaints in #2421 .
2018-08-23 18:07:28 +02:00
Anthony Sottile
85482d575e
Replace Source with dedent where possible
2018-08-23 09:06:17 -07:00
Bruno Oliveira
6f7365509d
Merge pull request #3860 from asottile/purge_more_py
...
Purge more usage of `py` module
2018-08-23 06:05:32 -03:00
Anthony Sottile
7099ea9bb0
py.builtin._reraise -> six.reraise
2018-08-22 23:00:58 -07:00
Anthony Sottile
dccac69d82
py.builtin.text -> six.text_type
2018-08-22 23:00:06 -07:00
Anthony Sottile
c2cd337886
py.builtin.exec_ => six.exec_
2018-08-22 23:00:06 -07:00
Anthony Sottile
0fc4a806e5
py.builtins._totext -> string literals or six.text_type
2018-08-22 23:00:04 -07:00
turturica
4d3c1ab4f0
Fixes #3854
2018-08-22 21:42:59 -07:00
turturica
e4f76f6350
Merge branch 'master' of github.com:pytest-dev/pytest into fix-3854
2018-08-22 20:36:52 -07:00
Anthony Sottile
0d65783dce
Fix unicode errors when changing to .format(...)
2018-08-22 19:00:43 -07:00
Anthony Sottile
8bb8b91357
pyupgrade 1.4: tests
2018-08-22 18:47:21 -07:00
Bruno Oliveira
8804c7333a
Fix CHANGELOG formatting
2018-08-22 20:06:13 -03:00