Code

Merge master into features#2790

Code

Merged

RonnyPfannschmidt merged 22 commits intopytest-dev:featurespytest-dev/pytest:featuresfrom nicoddemus:merge-master-into-featuresnicoddemus/pytest:merge-master-into-featuresCopy head branch name to clipboardSep 20, 2017

+172-35

Commits

Commits on Sep 5, 2017

• Set xfail_strict=True in pytest's own test suite

  Show description for 10d43bd
  nicoddemus

  committed
  10d43bd

  Copy full SHA for 10d43bd

Commits on Sep 7, 2017

• Fix crash in FastFilesCompleter with no prefix

  evanunderscore

  committed
  6cf515b

  Copy full SHA for 6cf515b

Commits on Sep 8, 2017

• add warning to skipping docs re marker inheritance

  

  Joe Hamman

  committed
  b2a8e06

  Copy full SHA for b2a8e06

Commits on Sep 9, 2017

• [bugfix] Checking MarkDecorator equality returns False for non-MarkDecorator object

  seanluong

  committed
  1e93089

  Copy full SHA for 1e93089

• Merge pull request pytest-dev#2764 from xuanluong/issue-2758-fix-mark-decorator-equality

  Show description for 25ed4ed
  RonnyPfannschmidt

  authored
  25ed4ed

  Copy full SHA for 25ed4ed

• Merge pull request pytest-dev#2763 from jhamman/docs/skipif_class_warning

  Show description for 3c1ca03
  nicoddemus

  authored
  3c1ca03

  Copy full SHA for 3c1ca03

• Fix typo in example of passing a callable to markers

  seanluong

  committed
  15222ce

  Copy full SHA for 15222ce

• Rename changelog file to PR id number

  seanluong

  committed
  e27a0d6

  Copy full SHA for e27a0d6

Commits on Sep 10, 2017

• Merge pull request pytest-dev#2765 from xuanluong/pass-callable-to-marker-typo

  Show description for bee2c86
  nicoddemus

  authored
  bee2c86

  Copy full SHA for bee2c86

• Update documentation on multiple calls of metafunc.parametrize

  seanluong

  committed
  696c702

  Copy full SHA for 696c702

• Merge pull request pytest-dev#2766 from xuanluong/issue-1548-docs-multiple-calls-metafunc-parametrize

  Show description for e57cc55
  nicoddemus

  authored
  e57cc55

  Copy full SHA for e57cc55

Commits on Sep 12, 2017

• Remove xfail mark from passing test in py26

  nicoddemus

  committed
  abfd977

  Copy full SHA for abfd977

Commits on Sep 13, 2017

• Merge pull request pytest-dev#2754 from nicoddemus/xfail_strict

  Show description for 70cdfaf
  RonnyPfannschmidt

  authored
  70cdfaf

  Copy full SHA for 70cdfaf

• Add development guide to docs

  nicoddemus

  committed
  52c134a

  Copy full SHA for 52c134a

Commits on Sep 14, 2017

• Merge pull request pytest-dev#2760 from nicoddemus/labels

  Show description for 25d2acb
  nicoddemus

  authored
  25d2acb

  Copy full SHA for 25d2acb

• Small fixes to development_guide: title and label names

  Show description for 810320f
  nicoddemus

  committed
  810320f

  Copy full SHA for 810320f

• Merge pull request pytest-dev#2750 from evanunderscore/fix-filescompleter

  Show description for ac5c5cc
  nicoddemus

  authored
  ac5c5cc

  Copy full SHA for ac5c5cc

Commits on Sep 16, 2017

• Change to py36 as main environment for Python 3 environments in tox

  Show description for 9933635
  nicoddemus

  committed
  9933635

  Copy full SHA for 9933635

Commits on Sep 17, 2017

• Merge pull request pytest-dev#2785 from nicoddemus/py36

  Show description for bf77daa
  RonnyPfannschmidt

  authored
  bf77daa

  Copy full SHA for bf77daa

Commits on Sep 18, 2017

• Merge remote-tracking branch 'upstream/master' into features

  nicoddemus

  committed
  3ebfb88

  Copy full SHA for 3ebfb88

Commits on Sep 19, 2017

• Fix call to outcome.get_result now that outcome.result is deprecated

  nicoddemus

  committed
  afe7966

  Copy full SHA for afe7966

• Update tox and appveyor environments to use py36 by default

  nicoddemus

  committed
  a2da5a6

  Copy full SHA for a2da5a6