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.

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

Merge master into features #3490

Merged

Conversation

nicoddemus
Copy link
Member

No description provided.

jdufresne and others added 23 commits April 26, 2018 06:49
Update all pypi.python.org URLs to pypi.org
Just noticed that conda-forge has its own badge so let's use that
Use conda-forge badge instead of anaconda's
…diffs

Escape whitespace only strings when diffing them on failed assertions
This test sometimes fails on AppVeyor with:

```
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
.0 = <listiterator object at 0x0549DC50>
    leaked_types = sum(1 for _ in gc.garbage
>                   if 'PseudoFixtureDef' in str(_))
E   UnicodeEncodeError: 'ascii' codec can't encode character u'\u263a' in position 23: ordinal not in range(128)
test_request_garbage.py:19: UnicodeEncodeError
====================== 1 passed, 1 error in 1.39 seconds ======================
```

Use our internal "safe_repr" function to handle Encode errors: who knows
what objects are in garbage after all.
The value is pretty close to the new default that will come out in
future hypothesis versions, which is generating a deprecation error
on CI.

Using a loose deadline because CI boxes are not reliable in how much
CPU power they have available
change doc copyright year to range and auto update year
…-hypothesis

Attempt to fix CI problems related to Hypothesis
@coveralls
Copy link

Coverage Status

Coverage increased (+0.02%) to 92.741% when pulling 6748799 on nicoddemus:merge-master-into-features into 35f53a7 on pytest-dev:features.

@nicoddemus
Copy link
Member Author

I think this can be merged now. 👍

@RonnyPfannschmidt RonnyPfannschmidt merged commit 4aa7eba into pytest-dev:features May 19, 2018
@nicoddemus nicoddemus deleted the merge-master-into-features branch May 19, 2018 17:26
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.

6 participants