-
-
Notifications
You must be signed in to change notification settings - Fork 2.7k
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
RonnyPfannschmidt
merged 23 commits into
pytest-dev:features
from
nicoddemus:merge-master-into-features
May 19, 2018
Merged
Merge master into features #3490
RonnyPfannschmidt
merged 23 commits into
pytest-dev:features
from
nicoddemus:merge-master-into-features
May 19, 2018
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
For details on the new PyPI, see the blog post: https://pythoninsider.blogspot.ca/2018/04/new-pypi-launched-legacy-pypi-shutting.html
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.
Attempt to fix flaky test on Python 2
Spelling and grammar fixes
#dropthedot
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
I think this can be merged now. 👍 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.