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
Ronny Pfannschmidt
d41119ed04
add the config
2018-05-23 16:45:09 +02:00
Bruno Oliveira
afde9f07f7
Update number of tests in email template
2018-05-23 08:06:27 -03:00
Bruno Oliveira
b4cd010d71
Merge pull request #3495 from nicoddemus/release-3.6.0
...
Release 3.6.0
2018-05-23 07:51:30 -03:00
Bruno Oliveira
45e7703133
Move mark revamp note to the top of the CHANGELOG
2018-05-22 21:12:51 -03:00
Bruno Oliveira
d70e910b65
Preparing release version 3.6.0
2018-05-23 00:07:48 +00:00
Bruno Oliveira
c55db1faac
Merge remote-tracking branch 'upstream/master' into release-3.6.0
2018-05-23 00:03:58 +00:00
Bruno Oliveira
16583a6d43
Add missing libs to tasks/requirements.txt
2018-05-23 00:03:47 +00:00
Bruno Oliveira
7985eff5b4
Merge pull request #3497 from hroncok/approx_compat_import
...
Import Mapping and Sequence from compat in python_api::approx
2018-05-22 20:57:29 -03:00
Miro Hrončok
5072226f69
Import Mapping and Sequence from compat in python_api::approx
...
Related to https://github.com/pytest-dev/pytest/issues/3339
Fixes a DeprecationWarning on Python 3.7
Adds Mapping to compat
2018-05-22 22:25:15 +02:00
Ronny Pfannschmidt
6c8d46d8ea
Merge pull request #3487 from tgoodlet/detect_pytest_hook_prefix
...
Detect `pytest_` prefixed hooks
2018-05-22 21:36:58 +02:00
Bruno Oliveira
7d0c9837ce
Merge pull request #3459 from RonnyPfannschmidt/mark-iter-name-filter
...
introduce name filtering for marker iteration again
2018-05-21 13:24:39 -03:00
Bruno Oliveira
8e17e32253
Merge pull request #3492 from timhughes/patch-1
...
fix typo in docs
2018-05-20 15:51:03 -03:00
Tim Hughes
f0b855369c
fix typo
2018-05-20 19:14:06 +01:00
Ronny Pfannschmidt
4aa7ebaf52
Merge pull request #3490 from nicoddemus/merge-master-into-features
...
Merge master into features
2018-05-19 11:36:11 +02:00
Tyler Goodlet
486b786cb2
Add trivial changelog entry
2018-05-18 12:02:50 -04:00
Bruno Oliveira
674879976f
Merge remote-tracking branch 'upstream/master' into merge-master-into-features
2018-05-18 12:30:08 -03:00