Skip to content

merge master into features#1884

Merged
nicoddemus merged 13 commits intofeaturesfrom
master
Aug 30, 2016
Merged

merge master into features#1884
nicoddemus merged 13 commits intofeaturesfrom
master

Conversation

@RonnyPfannschmidt
Copy link
Copy Markdown
Member

.

nicoddemus and others added 11 commits August 23, 2016 23:31
Improve error message when passing non-string ids to pytest.mark.parametrize
Add buffer attribute to DontReadFromInput
This is a leftover when invocation-scoped fixtures
were pulled back.

Fix #1872
Fix UnicodeEncodeError when string comparison with unicode has failed.
…n-example

Remove example of "monkeypatch" used in session scope
* Changed "index" to be more similar to the README (#1708).
* Fixes numerous issues like missing documents, syntax errors, etc (#1829, #432).
* Mention all docs in "contents.rst" so it's easier for users to locate (#1112).
* Add doc generation and checking to Travis and AppVeyor, to avoid re-introducing errors.

Fixes #432, Fixes #1112, Fixes #1708, Fixes #1829
docs warnings as errors and initial page similar to README
@coveralls
Copy link
Copy Markdown

Coverage Status

Coverage decreased (-0.003%) to 93.027% when pulling e75078e on master into c5675d3 on features.

@coveralls
Copy link
Copy Markdown

Coverage Status

Coverage decreased (-0.003%) to 93.027% when pulling 82218e4 on master into c5675d3 on features.

@nicoddemus
Copy link
Copy Markdown
Member

Triggering a new build, it seems the pypy issue on AppVeyor fixed itself. 😁

@nicoddemus nicoddemus merged commit 9d2149d into features Aug 30, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants