jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
7,943 Commits 2 Branches 0 Tags 34 MiB
Commit Graph

7943 Commits

Author SHA1 Message Date
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
Bruno Oliveira 48215fdcb9
Merge pull request #3500 from RonnyPfannschmidt/fix-3498-unittest-marks 
fix #3498 - correctly consider marks on unittest classes
 2018-05-24 13:51:17 -03:00
Ronny Pfannschmidt 5a6a580765 clean env for the linting stage 2018-05-24 14:18:34 +02:00
Ronny Pfannschmidt df17bb2bd3 switch linting tox env to use pre-commit, clean out travis linting env as unneeded 2018-05-24 14:17:09 +02:00
Ronny Pfannschmidt 6eb7af5a4e experimentally add pre-commit for linting in travis 2018-05-24 13:51:15 +02:00
Bruno Oliveira bc25d51b2f
Re-word changelog 2018-05-24 07:27:40 -03:00
Ronny Pfannschmidt 9ed1289b01 run black on test_source_multiline_block.py 2018-05-24 12:12:12 +02:00
Ronny Pfannschmidt 5a0c9aca63 correctly instantiate fixtureinfo for unittest tests, fixes #3498 2018-05-24 10:29:42 +02:00
Ronny Pfannschmidt da2c2e8492 more debugging for #3498 2018-05-24 09:58:36 +02:00
Ronny Pfannschmidt 74cfdc5feb add failing test for #3498 2018-05-24 07:30:38 +02:00
Jeffrey Rackauckas b4e0265622 Removed whitespace from empty line. 2018-05-23 20:15:28 -07:00
Jeffrey Rackauckas 210ad22dbe Updating changelog text 2018-05-23 19:43:06 -07:00
Jeffrey Rackauckas 6c519b1280 Fixed a bug where stdout and stderr were logged twice by junitxml. 2018-05-23 19:34:45 -07:00
Ronny Pfannschmidt 57a55cd0a3 restore formatting of test_source_multiline_block 2018-05-23 20:26:13 +02:00
Ronny Pfannschmidt d4bf2ff8f5 fix test_source 2018-05-23 18:22:18 +02:00
Ronny Pfannschmidt 3e08c4ee64 sort out flake8 issues and unicode name usage 2018-05-23 18:12:04 +02:00
Ronny Pfannschmidt 703e4b11ba run black 2018-05-23 16:48:46 +02:00
Ronny Pfannschmidt 3e1590bcfc sort out pyupgrade fallout 2018-05-23 16:45:58 +02:00
Ronny Pfannschmidt 86fc31db8d apply most other hooks and opt out of black reformating 2018-05-23 16:45:58 +02:00
Ronny Pfannschmidt b60376dc28 add pre-commit to CONTRIBUTING.txt 2018-05-23 16:45:23 +02:00
Ronny Pfannschmidt 3b9e063fe8 fix line endings 2018-05-23 16:45:23 +02:00
Ronny Pfannschmidt 9aacb4635e run pyupgrade 2018-05-23 16:45:09 +02:00