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

Merge from master (November 04th, 2019) #137

Merged
merged 4 commits into from Nov 15, 2019
Merged

Merge from master (November 04th, 2019) #137

merged 4 commits into from Nov 15, 2019

Conversation

RatanShreshtha
Copy link
Member

No description provided.

pquentin and others added 4 commits November 14, 2019 18:28
The goal is to be able to to tweak the timeout values globally, and to
use larger timeouts on CI where running time is less predictable.
* Don't encode fragment into target

* Add entry in CHANGES.rst
@codecov
Copy link

codecov bot commented Nov 14, 2019

Codecov Report

Merging #137 into bleach-spike will increase coverage by 0.04%.
The diff coverage is 100%.

@@               Coverage Diff               @@
##           bleach-spike    #137      +/-   ##
===============================================
+ Coverage         99.25%   99.3%   +0.04%     
===============================================
  Files                29      29              
  Lines              2005    2002       -3     
===============================================
- Hits               1990    1988       -2     
+ Misses               15      14       -1
Impacted Files Coverage Δ
src/urllib3/util/url.py 99.48% <100%> (+0.49%) ⬆️

@pquentin
Copy link
Member

The change themselves look good, but unfortunately there's no merge commit. It's important because it allows git to track for us where we are in the history of urllib3. I'll probably fix that in my next PR.

Thanks! Merging.

@pquentin pquentin merged commit e7c96b5 into python-trio:bleach-spike Nov 15, 2019
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.

None yet

3 participants