Skip to content
This repository has been archived by the owner on Apr 14, 2022. It is now read-only.

Merge from master (July 26th, 2019) #126

Merged

Conversation

pquentin
Copy link
Member

@pquentin pquentin commented Oct 8, 2019

I tried and fail to understand how we should adapt this commit to our work. Given that the current situation is likely to change (see #123), I did not merge the actual functionality, but only the test of the default behavior (and the CHANGES/docs as we're not currently touching those for easier merges).

gsakkis and others added 2 commits July 26, 2019 14:37
…om-master-2019-07-26

I tried and fail to understand how we should adapt this commit to our
work. Given that the current situation is likely to change (see
python-trio#123), I did not merge the
actual functionality, but only the test of the default behavior (and the
CHANGES/docs as we're not currently touching those for easier merges).
@pquentin pquentin requested review from njsmith and removed request for njsmith October 8, 2019 12:25
@pquentin
Copy link
Member Author

pquentin commented Oct 8, 2019

(I need to merge another commit to fix the tests.)

@codecov
Copy link

codecov bot commented Oct 8, 2019

Codecov Report

Merging #126 into bleach-spike will not change coverage.
The diff coverage is n/a.

@@              Coverage Diff              @@
##           bleach-spike     #126   +/-   ##
=============================================
  Coverage         99.44%   99.44%           
=============================================
  Files                29       29           
  Lines              1986     1986           
=============================================
  Hits               1975     1975           
  Misses               11       11

@pquentin pquentin requested a review from njsmith October 8, 2019 19:39
@pquentin pquentin changed the title Merge from master 2019 07 26 Merge from master (July 26th, 2019) Oct 8, 2019
@RatanShreshtha RatanShreshtha merged commit 176b373 into python-trio:bleach-spike Oct 9, 2019
Copy link
Member

@RatanShreshtha RatanShreshtha left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me

@pquentin pquentin deleted the merge-from-master-2019-07-26 branch October 9, 2019 06:09
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants