Commitf7d891c

authored

Merge pull request#18230 from meeseeksmachine/auto-backport-of-pr-18225-on-v3.3.x

Backport PR#18225 on branch v3.3.x (Use certifi when downloading bundled build requirements.)

2 parentsc0addc9 +bfc723c commitf7d891cCopy full SHA for f7d891c

File tree

+10

-1

lines changed

+10

-1

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -275,6 +275,7 @@ def build_extensions(self):`
`275`	`275`
`276`	`276`	`python_requires='>={}'.format('.'.join(str(n)forninmin_version)),`
`277`	`277`	`setup_requires=[`
	`278`	`+"certifi>=2020.06.20",`
`278`	`279`	`"numpy>=1.15",`
`279`	`280`	`],`
`280`	`281`	`install_requires=[`

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,13 @@ def _get_hash(data):`
`42`	`42`	`returnhasher.hexdigest()`
`43`	`43`
`44`	`44`
	`45`	`+@functools.lru_cache()`
	`46`	`+def_get_ssl_context():`
	`47`	`+importcertifi`
	`48`	`+importssl`
	`49`	`+returnssl.create_default_context(cafile=certifi.where())`
	`50`	`+`
	`51`	`+`
`45`	`52`	`defdownload_or_cache(url,sha):`
`46`	`53`	`"""`
`47`	`54`	`Get bytes from the given url or local cache.`
`@@ -73,7 +80,8 @@ def download_or_cache(url, sha):`
`73`	`80`	`# default User-Agent, but not (for example) wget; so I don't feel too`
`74`	`81`	`# bad passing in an empty User-Agent.`
`75`	`82`	`withurllib.request.urlopen(`
`76`		`-urllib.request.Request(url,headers={"User-Agent":""}))asreq:`
	`83`	`+urllib.request.Request(url,headers={"User-Agent":""}),`
	`84`	`+context=_get_ssl_context())asreq:`
`77`	`85`	`data=req.read()`
`78`	`86`
`79`	`87`	`file_sha=_get_hash(data)`

Comments

(0)