This repository was archived by the owner on Apr 14, 2022. It is now read-only.
Merge from master (July 26th, 2019) #121
Merged
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
…om-master-2019-06-19 I did not include the Python 3.4 fix as we don't support Python 3.4 anyway.
…om-master-2019-06-19
|
okay I am going to close #120 |
…om-master-2019-06-19
pquentin
force-pushed
the
merge-from-master-2019-07-26
branch
from
c7fcd52 to
5636e71
Compare
|
Thank you @RatanShreshtha, sorry about that, we'll better coordinate next time. I had a typo in upload_coverage.sh (pythom instead of python), I force pushed a commit to fix this. |
Codecov Report
@@ Coverage Diff @@
## bleach-spike #121 +/- ##
================================================
+ Coverage 99.42% 99.44% +0.01%
================================================
Files 29 29
Lines 1919 1986 +67
================================================
+ Hits 1908 1975 +67
Misses 11 11
|
|
Thank you for the review! |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
There are two main changes in this pull request: it switches to pure pytest (finally!) and removes the rfc3986 dependency. Sorry, @RatanShreshtha, I had this code ready before you submitted #120, but wanted to sleep on it before submitting it. So, unfortunately, this closes #120. Thank you for your work, and sorry about that.
I did not include the gcp-devrel change because we don't support Python 3.4 anyways, and it will be dropped soon in the master branch (as soon as we fix the CI there).
After this PR, there will only be three commits left in the master branch to merge. And only one of them is difficult: urllib3/urllib3#1652. We probably want to make auto close the default, but this code changed a lot in the async version, and I need to understand it again before taking a decision here.
But the nice thing here is that we'll finally be able to use pytest-trio. 🎉
(Oh, I use three times
git merge, so it's probably better to review those merge commits one by one instead of looking at everything at once.)