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

Restore context.set_ciphers() to create_urllib3_context() #1463

Merged
merged 6 commits into from Nov 1, 2018

Conversation

sethmlarson
Copy link
Member

@sethmlarson sethmlarson commented Oct 23, 2018

Fixes #1462.

@sethmlarson sethmlarson changed the title Restore context.set_ciphers() to create_urllib3_context Restore context.set_ciphers() to create_urllib3_context() Oct 23, 2018
@codecov-io
Copy link

codecov-io commented Oct 23, 2018

Codecov Report

Merging #1463 into master will decrease coverage by 0.96%.
The diff coverage is 50%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1463      +/-   ##
==========================================
- Coverage   99.45%   98.49%   -0.97%     
==========================================
  Files          22       22              
  Lines        1835     1857      +22     
==========================================
+ Hits         1825     1829       +4     
- Misses         10       28      +18
Impacted Files Coverage Δ
src/urllib3/util/ssl_.py 83.48% <50%> (-16.52%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 0aeba3b...3e47989. Read the comment docs.

@sethmlarson
Copy link
Member Author

sethmlarson commented Oct 23, 2018

Looks like gdal has gcc as a dependency now (it didn't in previous installs) and is failing because gcc is already installed on the system and it can't overwrite it?

@sethmlarson sethmlarson reopened this Oct 25, 2018
@sethmlarson sethmlarson requested a review from theacodes Oct 25, 2018
@sethmlarson sethmlarson force-pushed the SethMichaelLarson-patch-1 branch from fc8e77a to 6e2d616 Compare Oct 25, 2018
test/test_ssl.py Outdated

assert context.set_ciphers.call_count == 1
assert context.set_ciphers.call_args == mock.call(expected_ciphers)

Copy link
Member

@pquentin pquentin Oct 26, 2018

Choose a reason for hiding this comment

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

It looks like CI is failing because of this empty line.

@sethmlarson sethmlarson merged commit 0cedb3b into master Nov 1, 2018
3 checks passed
@sethmlarson sethmlarson deleted the SethMichaelLarson-patch-1 branch Nov 1, 2018
@sethmlarson
Copy link
Member Author

sethmlarson commented Nov 1, 2018

Thanks Thea, I'd say we're release-ready now.

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.

None yet

5 participants