Commit Graph

8316 Commits

Author SHA1 Message Date
AdamEr8
f883628939 Changelog mistake
Used pytest.fixture.skipif instead of pytest.mark.skipif
2018-06-22 08:51:26 +03:00
AdamEr8
40839b5a3a Rename prnum.trivial.rst to 3611.trivial.rst 2018-06-22 08:46:34 +03:00
AdamEr8
5e56d77542 Create prnum.trivial.rst
Added changelog file
2018-06-22 08:33:35 +03:00
Bruno Oliveira
de98939ebf Merge pull request #3608 from avirlrma/features
add reamde for .pytest_cache
2018-06-21 21:05:23 -03:00
Bruno Oliveira
0d3914b626 Remove extra '\' left at the end of a line in cache's readme contents 2018-06-21 20:12:50 -03:00
Bruno Oliveira
eb94bce3e2 Change 3519 to trivial 2018-06-21 20:11:22 -03:00
Bruno Oliveira
b897008887 Improve CHANGELOG grammar 2018-06-21 20:09:32 -03:00
Anthony Sottile
630428c611 Merge pull request #3609 from asottile/remove_warning_py2_functools_reduce
Silence usage of `reduce` warning in python 2
2018-06-21 15:08:31 -07:00
Anthony Sottile
8b4c59e606 Silence usage of reduce warning in python 2 2018-06-21 13:27:00 -07:00
avirlrma
998d540b73 fixed changelog entry 2018-06-21 17:56:26 +05:30
avirlrma
c672bfa32e added changelog entry
moved cache readme tests to test_cacheprovider.py
2018-06-21 17:43:10 +05:30
avirlrma
8f1d8ac970 fixed linting errors
ran black
removed unused imports and variables
2018-06-21 15:15:55 +05:30
AdamEr8
1ac1ee6fcb Fixed text description above skipif's example
@pytest.mark.skipif's example's description (above the code) was the opposite of the condition in the code,
fixed the description to match the code.
2018-06-21 12:09:56 +03:00
avirlrma
53d4710c62 added tests for .pytest_cache README
Helper class to check if readme exists in .pytest_cache directory
 Tests to check for readme when tests pass and when they fail
2018-06-21 14:25:00 +05:30
avirlrma
31f089db6a add reamde for .pytest_cache
method - `ensure_readme()`
2018-06-21 13:14:58 +05:30
Ronny Pfannschmidt
b7b9c54d27 Merge pull request #3603 from nicoddemus/fix-freeze-job
Fix reference to py36-freeze in travis and appveyor
2018-06-21 09:33:59 +02:00
Ronny Pfannschmidt
e86fe38144 Merge pull request #3598 from nicoddemus/small-callspec2-cleanup
Remove unused attribute and parameter in CallSpec2
2018-06-20 18:04:34 +02:00
Bruno Oliveira
5b26178397 Merge pull request #3602 from nicoddemus/release-3.6.2
Release 3.6.2
2018-06-20 08:12:43 -03:00
Bruno Oliveira
130100bba1 Fix reference to py36-freeze in travis and appveyor
Travis and AppVeyor were executing "py35-freeze", which does not actually
exist in tox.ini.
2018-06-20 07:53:41 -03:00
Bruno Oliveira
46aa18dfa7 Lint regendoc changes 3.6.2 2018-06-19 21:34:03 -03:00
Bruno Oliveira
617a5fcf98 Preparing release version 3.6.2 2018-06-20 00:29:58 +00:00
Bruno Oliveira
19ba243cae Merge pull request #3600 from RonnyPfannschmidt/pyproject-compliance
add build-system section to pyproject.toml
2018-06-19 06:58:28 -03:00
Ronny Pfannschmidt
af5d41fdfd add build-system section to pyproject.toml
this makes the file valid and prepares for https://github.com/pypa/pip/issues/5416 and https://github.com/pypa/pip/pull/5512
2018-06-19 10:41:04 +02:00
Bruno Oliveira
85be8bdf49 Merge pull request #3599 from pytest-dev/asottile-patch-1
Use --show-diff-on-failure for pre-commit CI invocation
2018-06-18 23:31:01 -03:00
Anthony Sottile
8e9f1d2417 Use --show-diff-on-failure for pre-commit CI invocation 2018-06-18 18:27:48 -07:00
Bruno Oliveira
93e55ad2fa Remove unused attribute and parameter in CallSpec2 2018-06-18 21:48:49 -03:00
Bruno Oliveira
2925f3057f Merge pull request #3584 from jwodder/fix-3583
Fix encoding error with `print` statements in doctests
2018-06-18 08:03:07 -03:00
Anthony Sottile
a93ad1fb77 Merge pull request #3590 from alexbarbato/3525_typo_fixture_docs
3525 typo fixture docs
2018-06-16 13:28:21 -07:00
Alex Barbato
561db95521 Add changelog file. 2018-06-16 12:44:19 -04:00
Alex Barbato
9408291c50 Fixing parens typo in fixture.rst 2018-06-16 12:40:25 -04:00
Ronny Pfannschmidt
4dc7b4ace6 Merge pull request #3589 from hynek/master
Fix 2 DeprecationWarnings about invalid escape seq
2018-06-16 11:56:35 +02:00
Hynek Schlawack
acb8f23311 Fix 2 DeprecationWarnings about invalid escape seq 2018-06-16 10:37:33 +02:00
Bruno Oliveira
9d60cf25c0 Merge pull request #2207 from RonnyPfannschmidt/fix/519
add example scripts for issue #519
2018-06-15 15:05:18 -03:00
Bruno Oliveira
9e32b6ae48 Small typo and grammar fix 2018-06-15 15:05:00 -03:00
Ronny Pfannschmidt
99402cf1c0 add a readme to the example scripts 2018-06-15 20:02:01 +02:00
Anthony Sottile
b285078db4 Merge pull request #3535 from RonnyPfannschmidt/config-split
begin to turn config into package
2018-06-15 10:28:06 -07:00
John T. Wodder II
d382f3e77f [#3583] Fix encoding error with print statements in doctests
This fix was suggested by Stack Overflow user phd in
<https://stackoverflow.com/a/50863820/744178>.
2018-06-15 17:23:54 +00:00
John T. Wodder II
5221a14764 Failing test case for #3583 2018-06-15 17:23:49 +00:00
Ronny Pfannschmidt
3ac2ae3c8c black 2018-06-15 18:13:45 +02:00
Ronny Pfannschmidt
ea906056fa add the actually expected fixtureorder for #519 2018-06-15 18:04:24 +02:00
Ronny Pfannschmidt
c081c5ee23 add example scripts for issue #519 2018-06-15 18:04:24 +02:00
Bruno Oliveira
3dcdaab103 Merge pull request #3585 from wcooley/feature/3579-caplog-messages
Add `messages` property to `caplog` fixture.
2018-06-15 12:41:33 -03:00
Wil Cooley
3615977608 Add messages property to caplog fixture. 2018-06-14 12:22:33 -07:00
Bruno Oliveira
94c41bec64 Merge pull request #3576 from RonnyPfannschmidt/addmarker-api
fix addmarker - extract mark from markdecorator
2018-06-13 18:36:40 -03:00
Ronny Pfannschmidt
8d072205e9 fix whitespace 2018-06-13 22:00:22 +02:00
Bruno Oliveira
b5102d03a6 Fix add_marker docs 2018-06-13 14:57:10 -03:00
Ronny Pfannschmidt
791bb3502c changelog 2018-06-13 17:29:42 +02:00
Ronny Pfannschmidt
eb0c6a8287 fix addmarker - extract mark from markdecorator 2018-06-13 17:27:00 +02:00
Bruno Oliveira
4d0297b413 Merge pull request #3577 from RonnyPfannschmidt/addmarker-fix
fix addmarker - extract mark from markdecorator
2018-06-13 07:30:22 -03:00
Bruno Oliveira
88ae21f2cc Add mock dependency to py27-nobyte 2018-06-12 18:07:40 -03:00