floraachy/pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,914 Commits 32 Branches 205 Tags
1a7dcd73cf38f07ccaa4bd19c476750a1c678cbc
Commit Graph

7914 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Bruno Oliveira
97d48ba60d Add documentation blurb for --strict 
Fix #3549
 2018-06-09 12:02:21 -03:00
Bruno Oliveira
55bbd3e3e2 Merge pull request #3553 from asottile/changelog_3552 
Add changelog entry for #3552
 2018-06-09 10:31:54 -03:00
Anthony Sottile
4c01dd651e Add changelog entry for #3552 2018-06-08 06:20:57 -07:00
Bruno Oliveira
472354c714 Merge pull request #3552 from asottile/remove_setup_py_test 
Remove setup.py test now that it's broken
 2018-06-08 08:28:18 -03:00
Anthony Sottile
c1d9ca81df Remove setup.py test now that it's broken 2018-06-07 22:01:14 -07:00
Bruno Oliveira
f389a4e91f Merge pull request #3545 from blueyed/int 
Improve display of hint about --fulltrace with KeyboardInterrupt
 2018-06-07 20:03:06 -03:00
Bruno Oliveira
942d363c03 Improve changelog formatting 2018-06-07 18:55:50 -03:00
Daniel Hahler
c30c137a95 Improve display of hint about --fulltrace with KeyboardInterrupt 
- display the location first
- display hint about --fulltrace in parenthesis
 2018-06-07 23:50:24 +02:00
Anthony Sottile
18157659ca Merge pull request #3544 from asottile/correct_changelot 
Correct issue number in changelog
 2018-06-06 14:06:13 -07:00
Anthony Sottile
60b34ec7ec Correct issue number in changelog 2018-06-06 13:27:59 -07:00
Bruno Oliveira
60273d7e99 Merge pull request #3541 from samueldg/docs/fix-plugin-list 
Fix typo in plugin list example
 2018-06-05 20:28:24 -03:00
Samuel Dion-Girardeau
d694290626 Fix typo in plugin list example 2018-06-05 18:27:59 -04:00
Bruno Oliveira
56b3a9eb8f Merge pull request #3534 from nicoddemus/release-3.6.1 
Release 3.6.1
 2018-06-05 14:45:00 -03:00
Bruno Oliveira
2a79f58ba3 Fix linting 3.6.1 2018-06-04 22:14:04 -03:00
Bruno Oliveira
66ec0a50b6 Preparing release version 3.6.1 2018-06-05 01:11:27 +00:00
Bruno Oliveira
c58b67c540 Configure towncrier to use src directory 2018-06-05 01:10:36 +00:00
Bruno Oliveira
cc793a8575 Merge pull request #3522 from NiklasMM/fix/3461_factory-fixture-doc 
Add factory fixture example to documentation.
 2018-06-04 22:09:50 -03:00
Ronny Pfannschmidt
7f5cb46835 Merge pull request #3531 from hroncok/370b5 
Module docstrings in 3.7 are not part of Module node anymore
 2018-06-05 01:16:14 +02:00
Ronny Pfannschmidt
a7f9e8382b Merge pull request #3529 from asottile/unpy25 
Remove some python2.5 compatibility code
 2018-06-04 16:25:00 +02:00
Miro Hrončok
39ebdab1bc DRY in TestAssertionRewrite 2018-06-04 14:03:13 +02:00
Miro Hrončok
9a6fa33c69 Module docstrings in 3.7 are not part of Module node anymore 
Fixes https://github.com/pytest-dev/pytest/issues/3530
 2018-06-04 13:58:35 +02:00
Anthony Sottile
2f6555dfd3 Add changelog entry 2018-06-03 13:12:49 -07:00
Anthony Sottile
ff19f273a9 Use six to import queue instead of py.builtin._tryimport 2018-06-03 13:12:49 -07:00
Anthony Sottile
04f08b67a4 __code__ and __self__ are attributes in python2.6+ 2018-06-03 13:12:46 -07:00
Anthony Sottile
3d0717813a bytes() is a builtin in python2.6+ 2018-06-03 11:54:36 -07:00
Ronny Pfannschmidt
d609b635f4 Merge pull request #3528 from asottile/blacken_docs 
blacken docs
 2018-06-03 18:40:11 +02:00
Anthony Sottile
0f2d7dc73c blacken docs 2018-06-03 07:58:46 -07:00
Anthony Sottile
5c878001ea Manual docs changes so syntax is parseable 2018-06-02 20:19:17 -07:00
Bruno Oliveira
4dc5f7897d Fix typo in marks.rst 2018-05-31 12:43:48 -03:00
Niklas Meinzer
08de3dad33 Add factory fixture example to documentation. 
Close https://github.com/pytest-dev/pytest/issues/3461
 2018-05-31 11:21:10 +02:00
Bruno Oliveira
5748c5ce8f Fix default cache directory to .pytest_cache 2018-05-30 08:24:10 -03:00
Bruno Oliveira
b6a302d0a8 Merge pull request #3516 from RonnyPfannschmidt/travis-optimize 
enable pip/pre-commit caching on travis and appveyor
 2018-05-27 12:51:51 -03:00
Ronny Pfannschmidt
130f76f66e enable pip/pre-commit caching on travis and appveyor 2018-05-27 13:05:10 +02:00
Bruno Oliveira
075faa5e2b Merge pull request #3513 from RonnyPfannschmidt/src-layout 
switch to src layout
 2018-05-26 10:36:23 -03:00
Ronny Pfannschmidt
eaa882f3d5 switch to src layout 2018-05-26 09:10:38 +02:00
Ronny Pfannschmidt
ee6c54904b Merge pull request #3512 from asottile/rst_via_pre_commit 
Call rst-lint directly with pre-commit
 2018-05-26 08:09:11 +02:00
Anthony Sottile
2a8463c745 Call rst-lint directly with pre-commit 2018-05-25 18:16:54 -07:00
Bruno Oliveira
1d451c786d Merge pull request #3509 from nicoddemus/marshal-3503 
Write rewritten code using file.write(marshal.dumps())
 2018-05-25 21:24:45 -03:00
Bruno Oliveira
a36bab448f Merge pull request #3485 from RonnyPfannschmidt/pre-commit-hook 
adapt Pre commit hook and black
 2018-05-25 19:03:45 -03:00
Bruno Oliveira
437a6fb224 Add "black code-style" badge 2018-05-25 18:23:59 -03:00
Bruno Oliveira
1b16d649f9 Fix formatting of merged files 2018-05-25 18:21:48 -03:00
Bruno Oliveira
6f8547cc1a Merge branch 'master' into pre-commit-hook 2018-05-25 18:14:43 -03:00
Bruno Oliveira
b5a94d8e6c Write rewritten code using file.write(marshal.dumps()) 
This works around the fact that some libraries might monkey patch
the file object, so the previous approach of marshal.dump(co, file)
breaks because file is not a built-in file object anymore.

Fix #3503
 2018-05-25 17:24:23 -03:00
Bruno Oliveira
65bc43dc56 Merge pull request #3505 from Avira/tox-lowercase 
Fix tox spelling (all lower case).
 2018-05-25 17:07:12 -03:00
Oliver Bestwalter
c55635d42a Fix tox spelling (all lower case). 2018-05-25 09:54:03 +02:00
Bruno Oliveira
93fdad28aa Merge pull request #3499 from jeffreyrack/3491-junit-logging 
3491 - Fixed a bug where stdout and stderr were logged twice by junitxml for xfail tests.
 2018-05-24 20:50:16 -03:00