Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge master into features #2869

Merged
merged 40 commits into from
Oct 25, 2017
Merged

Merge master into features #2869

merged 40 commits into from
Oct 25, 2017

Conversation

nicoddemus
Copy link
Member

No description provided.

seanluong and others added 30 commits October 5, 2017 20:14
@seanluong
Add mention of xpass in skip/xfail documentation
4bc6ecb
@RonnyPfannschmidt
Merge pull request pytest-dev#2815 from xuanluong/issue-1997-document…
761d552 
…-xpass

Add mention of xpass in skip/xfail documentation
@leezu
Fix pytest.parametrize when argnames are specified as kwarg
c24ffa3
@leezu
Add changelog for pytest-dev#2819
48b5c13
@leezu
Defensive fallback in case of kwargs not being present
e89abe6
@leezu
Add testcase for pytest-dev#2819
e86ba41
@RonnyPfannschmidt
Merge pull request pytest-dev#2819 from leezu/fix_kwargs_fixtures
46e3043 
Fix pytest.parametrize when argnames are specified as kwarg
@MarSoft
Fix typo in parametrization doc
cfdebb3
@The-Compiler
Merge pull request pytest-dev#2840 from MarSoft/patch-2
ae4e596 
Fix typo in parametrization doc
@pgiraud
Fix auto-use fixture doc
a4fd5cd
@nicoddemus
Merge pull request pytest-dev#2841 from pgiraud/patch-1
3676da5 
Fix auto-use fixture doc
@meawoppl
Update mark.py
11b391f
@bilderbuchi
Clarify the documentation of fixture scopes. Closes pytest-dev#538.
baadd56
@The-Compiler
Merge pull request pytest-dev#2847 from meawoppl/patch-1
2d08005 
Spelling Fix
@bilderbuchi
Add documentation about python -m pytest invocation.
46cc9ab
@nicoddemus
Merge pull request pytest-dev#2848 from bilderbuchi/fix-538
8c7974a 
Clarify the documentation of fixture scopes
@nicoddemus
Merge pull request pytest-dev#2850 from bilderbuchi/docs-911
4cb60da 
Add documentation about python -m pytest invocation.
@OwenTuz
pytest-dev#2692: Document setup/teardown behaviour when using unittes…
3cdbb18 
…t-based suites
@tom-dalton-fanduel
Add failing test
29fa9d5
@tom-dalton-fanduel
Test now looks for real expected output
c03612f
@tom-dalton-fanduel
Working (I think) fix for pytest-dev#2836
1e6dc6f
@tom-dalton-fanduel
Add changelog entry for pytest-dev#2836
f003914
@tom-dalton-fanduel
Added Tom Dalton to AUTHORS
de9d116
@tom-dalton-fanduel
Remove redundant if, tidy if-body
ee7e1c9
@tom-dalton-fanduel
Shorter code, longer docstring
d714c19
@tom-dalton-fanduel
Docstring typo
a7199fa
@tom-dalton-fanduel
Address more review comments, fix massive bug I reintroduced in the n…
655ab0b 
…ode-splitting code :-/
@lancelote
Remove typo @ in assignment
dc5f33b
@The-Compiler
Merge pull request pytest-dev#2863 from lancelote/patch-1
531e0dc 
Remove typo @ in assignment
@nicoddemus
Add E722 and E741 flake errors to the ignore list
a3ec3df 
Also fixed 'E704 multiple statements on one line (def)' in python_api
nicoddemus and others added 8 commits October 23, 2017 18:35
@nicoddemus
Merge pull request pytest-dev#2859 from OwenTuz/issue-2692-document-s…
b61cbc4 
…etup-teardown-mismatch-in-unittest-integration

2692.docs document setup/teardown behaviour when using unittest-based su…
@nicoddemus
Make CONTRIBUTING and PR template more consistent regarding doc contr…
fe560b7 
…ibutions
@The-Compiler
Merge pull request pytest-dev#2865 from nicoddemus/contributing-docs
7b608f9 
Make CONTRIBUTING and PR template more consistent regarding doc contributions
@tom-dalton-fanduel
Move the generic separator to a constant
14e3a5f
@tom-dalton-fanduel
Merge branch 'issue-2836-fixture-collection-bug' of github.com:tom-da…
a5ac19c 
…lton-fanduel/pytest into issue-2836-fixture-collection-bug
@tom-dalton-fanduel
Unused import / lint
f5e72d2
@RonnyPfannschmidt
Merge pull request pytest-dev#2862 from tom-dalton-fanduel/issue-2836…
5631a86 
…-fixture-collection-bug

Issue 2836 fixture collection bug
@nicoddemus
Merge remote-tracking branch 'upstream/master' into merge-master-into…
6821d36 
…-features
@coveralls
Copy link

Coverage Status

Coverage increased (+0.02%) to 92.67% when pulling 6821d36 on nicoddemus:merge-master-into-features into 083084f on pytest-dev:features.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.03%) to 92.681% when pulling 6b86b0d on nicoddemus:merge-master-into-features into 083084f on pytest-dev:features.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.03%) to 92.68% when pulling 4e581b6 on nicoddemus:merge-master-into-features into 083084f on pytest-dev:features.

@RonnyPfannschmidt
Copy link
Member

as only the know failing ones break, im going to merge this one, thanks for bringing things up to date

@RonnyPfannschmidt RonnyPfannschmidt merged commit def471b into pytest-dev:features Oct 25, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.