summaryrefslogtreecommitdiff
AgeCommit message (Expand)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
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
2018-05-22Import Mapping and Sequence from compat in python_api::approxMiro Hrončok
2018-05-22Merge pull request #3487 from tgoodlet/detect_pytest_hook_prefixRonny Pfannschmidt
2018-05-21Merge pull request #3459 from RonnyPfannschmidt/mark-iter-name-filterBruno Oliveira
2018-05-20Merge pull request #3492 from timhughes/patch-1Bruno Oliveira
2018-05-20fix typoTim Hughes
2018-05-19Merge pull request #3490 from nicoddemus/merge-master-into-featuresRonny Pfannschmidt
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
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
2018-05-17Fix link to skipif tutorial in ref docsBruno Oliveira
2018-05-16Merge pull request #3476 from avirlrma/masterBruno Oliveira
2018-05-16Use a more recent hypothesis version on CIBruno Oliveira
2018-05-16Increase hypothesis deadlineBruno Oliveira
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
2018-05-15Merge pull request #3468 from scop/spellingBruno Oliveira
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
2018-05-04Attempt to fix flaky test on Python 2Bruno Oliveira
2018-05-04Merge pull request #3444 from nicoddemus/escape-whitespace-diffsRonny Pfannschmidt
2018-05-04Rename internal function as suggested during reviewBruno Oliveira
2018-05-03Escape whitespace only strings when diffing them on failed assertionsBruno Oliveira
2018-05-03Merge pull request #3442 from RonnyPfannschmidt/fix-3441-markexpr-markstorageBruno Oliveira