Code

Merge master into features#2869

Code

Merged

RonnyPfannschmidt merged 40 commits intopytest-dev:featurespytest-dev/pytest:featuresfrom nicoddemus:merge-master-into-featuresnicoddemus/pytest:merge-master-into-featuresCopy head branch name to clipboardOct 25, 2017

+191-55

Commits

Commits on Oct 6, 2017

• Add mention of xpass in skip/xfail documentation

  seanluong

  committed
  4bc6ecb

  Copy full SHA for 4bc6ecb

• Merge pull request pytest-dev#2815 from xuanluong/issue-1997-document-xpass

  Show description for 761d552
  RonnyPfannschmidt

  authored
  761d552

  Copy full SHA for 761d552

Commits on Oct 8, 2017

• Fix pytest.parametrize when argnames are specified as kwarg

  leezu

  committed
  c24ffa3

  Copy full SHA for c24ffa3

• Add changelog for pytest-dev#2819

  leezu

  committed
  48b5c13

  Copy full SHA for 48b5c13

• Defensive fallback in case of kwargs not being present

  leezu

  committed
  e89abe6

  Copy full SHA for e89abe6

• Add testcase for pytest-dev#2819

  leezu

  committed
  e86ba41

  Copy full SHA for e86ba41

Commits on Oct 9, 2017

• Merge pull request pytest-dev#2819 from leezu/fix_kwargs_fixtures

  Show description for 46e3043
  RonnyPfannschmidt

  authored
  46e3043

  Copy full SHA for 46e3043

Commits on Oct 15, 2017

• Fix typo in parametrization doc

  MarSoft

  authored
  cfdebb3

  Copy full SHA for cfdebb3

Commits on Oct 16, 2017

• Merge pull request pytest-dev#2840 from MarSoft/patch-2

  Show description for ae4e596
  The-Compiler

  authored
  ae4e596

  Copy full SHA for ae4e596

• Fix auto-use fixture doc

  pgiraud

  authored
  a4fd5cd

  Copy full SHA for a4fd5cd

• Merge pull request pytest-dev#2841 from pgiraud/patch-1

  Show description for 3676da5
  nicoddemus

  authored
  3676da5

  Copy full SHA for 3676da5

Commits on Oct 17, 2017

• Update mark.py

  meawoppl

  authored
  11b391f

  Copy full SHA for 11b391f

• Clarify the documentation of fixture scopes. Closes pytest-dev#538.

  bilderbuchi

  committed
  baadd56

  Copy full SHA for baadd56

Commits on Oct 18, 2017

• Merge pull request pytest-dev#2847 from meawoppl/patch-1

  Show description for 2d08005
  The-Compiler

  authored
  2d08005

  Copy full SHA for 2d08005

• Add documentation about python -m pytest invocation.

  bilderbuchi

  committed
  46cc9ab

  Copy full SHA for 46cc9ab

• Merge pull request pytest-dev#2848 from bilderbuchi/fix-538

  Show description for 8c7974a
  nicoddemus

  authored
  8c7974a

  Copy full SHA for 8c7974a

• Merge pull request pytest-dev#2850 from bilderbuchi/docs-911

  Show description for 4cb60da
  nicoddemus

  authored
  4cb60da

  Copy full SHA for 4cb60da

Commits on Oct 21, 2017

• pytest-dev#2692: Document setup/teardown behaviour when using unittest-based suites

  OwenTuz

  committed
  3cdbb18

  Copy full SHA for 3cdbb18

Commits on Oct 23, 2017

• Add failing test

  tom-dalton-fanduel

  committed
  29fa9d5

  Copy full SHA for 29fa9d5

• Test now looks for real expected output

  tom-dalton-fanduel

  committed
  c03612f

  Copy full SHA for c03612f

• Working (I think) fix for pytest-dev#2836

  tom-dalton-fanduel

  committed
  1e6dc6f

  Copy full SHA for 1e6dc6f

• Add changelog entry for pytest-dev#2836

  tom-dalton-fanduel

  committed
  f003914

  Copy full SHA for f003914

• Added Tom Dalton to AUTHORS

  tom-dalton-fanduel

  committed
  de9d116

  Copy full SHA for de9d116

• Remove redundant if, tidy if-body

  tom-dalton-fanduel

  committed
  ee7e1c9

  Copy full SHA for ee7e1c9

• Shorter code, longer docstring

  tom-dalton-fanduel

  committed
  d714c19

  Copy full SHA for d714c19

• Docstring typo

  tom-dalton-fanduel

  committed
  a7199fa

  Copy full SHA for a7199fa

• Address more review comments, fix massive bug I reintroduced in the node-splitting code :-/

  tom-dalton-fanduel

  committed
  655ab0b

  Copy full SHA for 655ab0b

• Remove typo @ in assignment

  lancelote

  committed
  dc5f33b

  Copy full SHA for dc5f33b

• Merge pull request pytest-dev#2863 from lancelote/patch-1

  Show description for 531e0dc
  The-Compiler

  authored
  531e0dc

  Copy full SHA for 531e0dc

• Add E722 and E741 flake errors to the ignore list

  Show description for a3ec3df
  nicoddemus

  committed
  a3ec3df

  Copy full SHA for a3ec3df

• Merge pull request pytest-dev#2859 from OwenTuz/issue-2692-document-setup-teardown-mismatch-in-unittest-integration

  Show description for b61cbc4
  nicoddemus

  authored
  b61cbc4

  Copy full SHA for b61cbc4

• Make CONTRIBUTING and PR template more consistent regarding doc contributions

  nicoddemus

  committed
  fe560b7

  Copy full SHA for fe560b7

Commits on Oct 24, 2017

• Merge pull request pytest-dev#2865 from nicoddemus/contributing-docs

  Show description for 7b608f9
  The-Compiler

  authored
  7b608f9

  Copy full SHA for 7b608f9

• Move the generic separator to a constant

  tom-dalton-fanduel

  committed
  14e3a5f

  Copy full SHA for 14e3a5f

• Merge branch 'issue-2836-fixture-collection-bug' of github.com:tom-dalton-fanduel/pytest into issue-2836-fixture-collection-bug

  tom-dalton-fanduel

  committed
  a5ac19c

  Copy full SHA for a5ac19c

• Unused import / lint

  tom-dalton-fanduel

  committed
  f5e72d2

  Copy full SHA for f5e72d2

• Merge pull request pytest-dev#2862 from tom-dalton-fanduel/issue-2836-fixture-collection-bug

  Show description for 5631a86
  RonnyPfannschmidt

  authored
  5631a86

  Copy full SHA for 5631a86

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

  nicoddemus

  committed
  6821d36

  Copy full SHA for 6821d36

• Fix additional linting issues

  nicoddemus

  committed
  6b86b0d

  Copy full SHA for 6b86b0d

Commits on Oct 25, 2017

• Use zip and map from six

  nicoddemus

  committed
  4e581b6

  Copy full SHA for 4e581b6