summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-05-23run blackRonny Pfannschmidt
2018-05-23sort out pyupgrade falloutRonny Pfannschmidt
2018-05-23apply most other hooks and opt out of black reformatingRonny Pfannschmidt
2018-05-23add pre-commit to CONTRIBUTING.txtRonny Pfannschmidt
2018-05-23fix line endingsRonny Pfannschmidt
2018-05-23run pyupgradeRonny Pfannschmidt
2018-05-23add the configRonny Pfannschmidt
2018-05-23Update number of tests in email templateBruno Oliveira
2018-05-23Merge pull request #3495 from nicoddemus/release-3.6.0Bruno Oliveira
Release 3.6.0
2018-05-22Move mark revamp note to the top of the CHANGELOGBruno Oliveira
2018-05-23Preparing release version 3.6.0Bruno Oliveira
2018-05-23Merge remote-tracking branch 'upstream/master' into release-3.6.0Bruno Oliveira
2018-05-23Add missing libs to tasks/requirements.txtBruno Oliveira
2018-05-22Merge pull request #3497 from hroncok/approx_compat_importBruno Oliveira
Import Mapping and Sequence from compat in python_api::approx
2018-05-22Import Mapping and Sequence from compat in python_api::approxMiro Hrončok
Related to https://github.com/pytest-dev/pytest/issues/3339 Fixes a DeprecationWarning on Python 3.7 Adds Mapping to compat
2018-05-22Merge pull request #3487 from tgoodlet/detect_pytest_hook_prefixRonny Pfannschmidt
Detect `pytest_` prefixed hooks
2018-05-21Merge pull request #3459 from RonnyPfannschmidt/mark-iter-name-filterBruno Oliveira
introduce name filtering for marker iteration again
2018-05-20Merge pull request #3492 from timhughes/patch-1Bruno Oliveira
fix typo in docs
2018-05-20fix typoTim Hughes
2018-05-19Merge pull request #3490 from nicoddemus/merge-master-into-featuresRonny Pfannschmidt
Merge master into features
2018-05-18Add trivial changelog entryTyler Goodlet
2018-05-18Merge remote-tracking branch 'upstream/master' into merge-master-into-featuresBruno Oliveira
2018-05-17Detect `pytest_` prefixed hooksTyler Goodlet
`pluggy` is deprecating the `implprefix` argument in the next major release so implement this detection in our derived plugin manager. Relates to pytest-dev/pluggy#145
2018-05-17Small grammar fix in CHANGELOGBruno Oliveira
2018-05-17Merge changelog marks refactoring changelog entries as discussed in reviewBruno Oliveira
2018-05-17Fix typo in mark.rstBruno Oliveira
2018-05-17Merge pull request #3480 from nicoddemus/deprecated-deadlne-hypothesisRonny Pfannschmidt
Attempt to fix CI problems related to Hypothesis
2018-05-17Fix link to skipif tutorial in ref docsBruno Oliveira
2018-05-16Merge pull request #3476 from avirlrma/masterBruno Oliveira
change doc copyright year to range and auto update year
2018-05-16Use a more recent hypothesis version on CIBruno Oliveira
2018-05-16Increase hypothesis deadlineBruno Oliveira
The value is pretty close to the new default that will come out in future hypothesis versions, which is generating a deprecation error on CI. Using a loose deadline because CI boxes are not reliable in how much CPU power they have available
2018-05-15Fix deprecation notice in Node.get_markerBruno Oliveira
2018-05-15Add section on how to update marks and add ref to the deprecation noticeBruno Oliveira
2018-05-15Small adjustment to the CHANGELOGBruno Oliveira
2018-05-15Small rewording to the CHANGELOGBruno Oliveira
2018-05-15Reword the changelogBruno Oliveira
2018-05-15Merge pull request #3469 from scop/dropthedotBruno Oliveira
#dropthedot
2018-05-15Merge pull request #3468 from scop/spellingBruno Oliveira
Spelling and grammar fixes
2018-05-15added changelog and added my name to the authorsaviral1701
2018-05-15change doc copyright year to range and auto update yearaviral1701
2018-05-14Fix formatting in CHANGELOG entryBruno Oliveira
2018-05-13#dropthedotVille Skyttä
2018-05-13Spelling and grammar fixesVille Skyttä
2018-05-11introduce name filtering for marker iteration againRonny Pfannschmidt
2018-05-05Merge pull request #3452 from nicoddemus/fix-flaky-xdist-testRonny Pfannschmidt
Attempt to fix flaky test on Python 2
2018-05-04Attempt to fix flaky test on Python 2Bruno Oliveira
This test sometimes fails on AppVeyor with: ``` _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ .0 = <listiterator object at 0x0549DC50> leaked_types = sum(1 for _ in gc.garbage > if 'PseudoFixtureDef' in str(_)) E UnicodeEncodeError: 'ascii' codec can't encode character u'\u263a' in position 23: ordinal not in range(128) test_request_garbage.py:19: UnicodeEncodeError ====================== 1 passed, 1 error in 1.39 seconds ====================== ``` Use our internal "safe_repr" function to handle Encode errors: who knows what objects are in garbage after all.
2018-05-04Merge pull request #3444 from nicoddemus/escape-whitespace-diffsRonny Pfannschmidt
Escape whitespace only strings when diffing them on failed assertions
2018-05-04Rename internal function as suggested during reviewBruno Oliveira
2018-05-03Escape whitespace only strings when diffing them on failed assertionsBruno Oliveira
Fix #3443
2018-05-03Merge pull request #3442 from RonnyPfannschmidt/fix-3441-markexpr-markstorageBruno Oliveira
Fix #3441 let mark expressions be populated from the modern marker storage