Commit Graph

8015 Commits

Author SHA1 Message Date
Bruno Oliveira 46aa18dfa7 Lint regendoc changes 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
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
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
Ronny Pfannschmidt 321f66f711 mark test_wrapped_getfuncargnames_patching as xfail 2018-06-12 22:25:05 +02:00
Ronny Pfannschmidt 52c4279918
Merge pull request #3572 from nicoddemus/remove-unused-scripts
Remove unused scripts and old docs
2018-06-12 21:57:51 +02:00
Bruno Oliveira 077c44cf69
Merge pull request #3578 from BartoszCki/master
Fix three spaces instead of four in docs
2018-06-12 15:17:40 -03:00
Bartosz Cierocki f786534173 Fix three spaces instead of four in docs 2018-06-12 19:39:51 +02:00
Ronny Pfannschmidt b0ec442d24 rework Node.add_marker parameter list and docstring 2018-06-12 17:55:58 +02:00
Bruno Oliveira 9a7c3a65f4
Improve CHANGELOG formatting 2018-06-12 11:07:42 -03:00
Ronny Pfannschmidt 37793d4cdb fix addmarker - extract mark from markdecorator 2018-06-12 15:50:58 +02:00
Ronny Pfannschmidt 1b5322da1b
Merge pull request #3571 from nicoddemus/pre-commit-contributors-guide
Improve contributing instructions regarding black/linting
2018-06-12 06:37:18 +02:00
Bruno Oliveira d6e7b1a21b Remove obsolete doc/en/test directory
Apparently this was an old version of the docs, which has long been superseded
2018-06-11 23:33:09 -03:00
Bruno Oliveira 4983de60d3 Remove unused scripts from docs 2018-06-11 23:32:49 -03:00
Bruno Oliveira e0a1da4eb9
Remove changelog for #3554
This entry was removed in #3562
2018-06-11 23:17:11 -03:00
Anthony Sottile ef88251573
Merge pull request #3570 from sangongs/fix_stack_finalizer
Continue to call finalizers in the stack when a finalizer raises an exception
2018-06-11 19:07:59 -07:00
Bruno Oliveira f300f7fa24 Improve contributing instructions regarding black/linting 2018-06-11 20:49:25 -03:00
Bruno Oliveira 41125968d9 Check the exception matches the message for completeness 2018-06-11 20:33:13 -03:00
Bruno Oliveira 4fd66e8a42 Run black on test file 2018-06-11 20:32:08 -03:00
Guoqiang Zhang a888bf182e Continue to call finalizers in the stack when a finalizer in a former scope raises an exception 2018-06-11 18:01:18 -04:00
Bruno Oliveira 04b65cfba0
Merge pull request #3565 from nicoddemus/xfail-test-request-garbage
Attempt to fix test_request_garbage on Windows
2018-06-11 15:23:47 -03:00
Ronny Pfannschmidt 61471df8da
Merge pull request #3562 from nicoddemus/revert-callinfo-result
Revert change of Callinfo.result default value
2018-06-11 19:03:01 +02:00
Ronny Pfannschmidt 1aba123ac5 fix doc build 2018-06-11 16:20:24 +02:00
Bruno Oliveira efc9a0ecb5
Merge pull request #3567 from michael-k/doc-typo
Fix typo in documentation
2018-06-11 09:09:53 -03:00
Michael Käufl 4a78711067 Fix typo in documentation 2018-06-11 13:28:09 +02:00
Bruno Oliveira 5ea647a245 Attempt to fix flaky test_request_garbage on Windows
Fix #3564
2018-06-10 19:18:44 -03:00
Bruno Oliveira 11705040ac
Merge pull request #3563 from asottile/undetermined_location_none
Print <undetermined location> instead of None for warnings
2018-06-10 16:19:50 -03:00
Anthony Sottile fe81de6150 git mv changelog/3554.bugfix{,.rst} 2018-06-10 10:53:15 -07:00
Anthony Sottile 49f621de76 Print <undetermined location> instead of None for warnings 2018-06-10 10:51:36 -07:00
Bruno Oliveira 10b0b81346 Revert change of Callinfo.result default value
As discussed in #3560, this should not go to master because this breaks
the API.

Reverts commits:

1a7dcd73cf
198e993969
2018-06-10 11:47:58 -03:00
Alan Velasco 80f8a3ad7c
Merge pull request #3560 from alanbato/fix_callinfo_rrp
Add a default value to CallInfo.result
2018-06-09 21:20:56 -07:00
Bruno Oliveira 198e993969
Format CHANGELOG 2018-06-09 21:31:32 -03:00
Alan Velasco 1a7dcd73cf Add a default value to CallInfo.result 2018-06-09 16:58:23 -07:00
Bruno Oliveira 7c8d072241
Merge pull request #3558 from nicoddemus/doc-strict
Add documentation blurb for --strict
2018-06-09 19:38:31 -03:00
Bruno Oliveira c4f72e4d13 Apply code review changes 2018-06-09 12:40:39 -03:00
Bruno Oliveira 3667a52ba2 Remove Mark api from mark.rst
Feels out of place in there, plus the reference documentation
already contains the reference API to all mark-related classes
2018-06-09 12:02:28 -03:00