summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2018-05-03add tests for #3441Ronny Pfannschmidt
2018-05-03Merge pull request #3436 from brianmaissy/feature/enter_pdb_on_keyboard_inter...Bruno Oliveira
2018-05-03fix test_mark_option_custom - it used the legacy keyword storage for addign m...Ronny Pfannschmidt
2018-05-03fix #3441 - use iter-marks to populate markexpr namespaceRonny Pfannschmidt
2018-05-02Merge pull request #3437 from nicoddemus/mark-changelogRonny Pfannschmidt
2018-05-01Improve changelog note about markersBruno Oliveira
2018-05-01Remove unused import to fix lintingBruno Oliveira
2018-05-02--pdb treats KeyboardInterrupt as exceptionBrian Maissy
2018-04-27Merge pull request #3433 from nicoddemus/conda-forge-badgeRonny Pfannschmidt
2018-04-27Use conda-forge badge instead of anaconda'sBruno Oliveira
2018-04-26Merge pull request #3431 from jdufresne/pypiBruno Oliveira
2018-04-26Update all pypi.python.org URLs to pypi.orgJon Dufresne
2018-04-25Merge pull request #3428 from nicoddemus/merge-master-into-featuresRonny Pfannschmidt
2018-04-24Merge remote-tracking branch 'upstream/master' into merge-master-into-featuresBruno Oliveira
2018-04-24Remove CHANGELOG entries left by old bug in towncrierBruno Oliveira
2018-04-24Merge pull request #3424 from nicoddemus/release-3.5.1Bruno Oliveira
2018-04-24Fix note about importing from collections.abcBruno Oliveira
2018-04-24Merge pull request #2849 from ApaDoctor/disable-repeated-fixtureRonny Pfannschmidt
2018-04-23Merge remote-tracking branch 'upstream/features' into ApaDoctor/disable-repea...Bruno Oliveira
2018-04-23Add test for applying fixture twiceBruno Oliveira
2018-04-23Move #3221 to trivial section in the CHANGELOGBruno Oliveira
2018-04-23Merge pull request #3422 from rachel1792/masterBruno Oliveira
2018-04-23Preparing release version 3.5.1Bruno Oliveira
2018-04-23Merge pull request #3367 from brianmaissy/feature/indicative_error_for_parame...Bruno Oliveira
2018-04-22updated doc to delete deprecated hookRachel Kogan
2018-04-20Merge pull request #3407 from rachel1792/masterBruno Oliveira
2018-04-20Update changelog formattingBruno Oliveira
2018-04-19Merge pull request #3382 from feuillemorte/3290-improve-monkeypatchBruno Oliveira
2018-04-19Merge pull request #3408 from MarSoft/patch-2Ronny Pfannschmidt
2018-04-18Fix typo in the commentСемён Марьясин
2018-04-17add changelogRachel Kogan
2018-04-17Merge branch 'master' of github.com:pytest-dev/pytestRachel Kogan
2018-04-17fix error in caplog docs.Rachel Kogan
2018-04-16Merge pull request #3401 from kohr-h/underscore_fixturesBruno Oliveira
2018-04-15added indicative error when parametrizing an argument with a default valueBrian Maissy
2018-04-14#3290 Fix docfeuillemorte
2018-04-14Mention omission of fixtures with leading '_', closes #3398Holger Kohr
2018-04-13#3290 Fix commentsfeuillemorte
2018-04-13Merge pull request #3397 from darrenburns/patch-2Ronny Pfannschmidt
2018-04-13Fix some mistakes in contributing.rstDarren Burns
2018-04-12Merge pull request #3395 from darrenburns/patch-1Bruno Oliveira
2018-04-12firther enhance the links in contributing.rstRonny Pfannschmidt
2018-04-12Update CONTRIBUTING.rstDarren Burns
2018-04-12Merge pull request #3390 from nicoddemus/atomic-pyc-writesRonny Pfannschmidt
2018-04-12Attempt to solve race-condition which corrupts .pyc files on WindowsBruno Oliveira
2018-04-12Merge pull request #3384 from nicoddemus/leak-frameBruno Oliveira
2018-04-12Merge pull request #3388 from nicoddemus/simplify-toxRonny Pfannschmidt
2018-04-12Merge pull request #3391 from nicoddemus/project-urlsRonny Pfannschmidt
2018-04-12Merge pull request #3387 from nicoddemus/merge-master-into-featuresRonny Pfannschmidt
2018-04-11Add additional project urls to setup.pyBruno Oliveira