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 #2790

Merged
merged 22 commits into from
Sep 20, 2017
Merged

Merge master into features #2790

merged 22 commits into from
Sep 20, 2017

Conversation

nicoddemus
Copy link
Member

No description provided.

nicoddemus and others added 20 commits September 5, 2017 19:57
@nicoddemus
Set xfail_strict=True in pytest's own test suite
10d43bd 
Fix pytest-dev#2722
@evanunderscore
Fix crash in FastFilesCompleter with no prefix
6cf515b
add warning to skipping docs re marker inheritance
b2a8e06
@seanluong
[bugfix] Checking MarkDecorator equality returns False for non-MarkDe…
1e93089 
…corator object
@RonnyPfannschmidt
Merge pull request pytest-dev#2764 from xuanluong/issue-2758-fix-mark…
25ed4ed 
…-decorator-equality

[bugfix] Checking MarkDecorator equality returns False for non-MarkDecorator object
@nicoddemus
Merge pull request pytest-dev#2763 from jhamman/docs/skipif_class_war…
3c1ca03 
…ning

add warning to skipping docs re marker inheritance
@seanluong
Fix typo in example of passing a callable to markers
15222ce
@seanluong
Rename changelog file to PR id number
e27a0d6
@nicoddemus
Merge pull request pytest-dev#2765 from xuanluong/pass-callable-to-ma…
bee2c86 
…rker-typo

Fix typo in example of passing a callable to markers
@seanluong
Update documentation on multiple calls of metafunc.parametrize
696c702
@nicoddemus
Merge pull request pytest-dev#2766 from xuanluong/issue-1548-docs-mul…
e57cc55 
…tiple-calls-metafunc-parametrize

Update documentation on multiple calls of metafunc.parametrize
@nicoddemus
Remove xfail mark from passing test in py26
abfd977
@RonnyPfannschmidt
Merge pull request pytest-dev#2754 from nicoddemus/xfail_strict
70cdfaf 
Set xfail_strict=True in pytest's own test suite
@nicoddemus
Add development guide to docs
52c134a
@nicoddemus
Merge pull request pytest-dev#2760 from nicoddemus/labels
25d2acb 
Add development guide to docs
@nicoddemus
Small fixes to development_guide: title and label names
810320f 
* Fix title to use a proper "title" section marker
* Fix labels by adding a " " after the ":"
* Fix OS labels after obvious mishap
* Sort labels
@nicoddemus
Merge pull request pytest-dev#2750 from evanunderscore/fix-filescompl…
ac5c5cc 
…eter

Fix crash in FastFilesCompleter with no prefix
@nicoddemus
Change to py36 as main environment for Python 3 environments in tox
9933635 
This also has the benefit of working around Travis recent failures
in Python 3.5 environments.
@RonnyPfannschmidt
Merge pull request pytest-dev#2785 from nicoddemus/py36
bf77daa 
Change to py36 as main environment for Python 3 environments in tox
@nicoddemus
Merge remote-tracking branch 'upstream/master' into features
3ebfb88
@coveralls
Copy link

Coverage Status

Coverage increased (+0.02%) to 92.08% when pulling 3ebfb88 on nicoddemus:merge-master-into-features into 9273e11 on pytest-dev:features.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.02%) to 92.08% when pulling a2da5a6 on nicoddemus:merge-master-into-features into 9273e11 on pytest-dev:features.

@nicoddemus nicoddemus mentioned this pull request Sep 19, 2017
Merged
4 tasks
@RonnyPfannschmidt RonnyPfannschmidt merged commit de0d19c into pytest-dev:features Sep 20, 2017
@RonnyPfannschmidt
Copy link
Member

thanks 👍

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.
5 participants
@nicoddemus @coveralls @RonnyPfannschmidt @evanunderscore @seanluong