Skip to content

Commit 7d1583d

Browse files
committed
Merge branch 'hotfix/20.0.2'
2 parents 33c59c3 + a7bbd46 commit 7d1583d

File tree

2 files changed

+1
-23
lines changed

2 files changed

+1
-23
lines changed

requirements.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,5 +53,4 @@ scipy==0.19.1
5353
# Md
5454
markdown==2.6.2
5555

56-
# Issue: certifi-2015.9.6.1 and 2015.9.6.2 fail verification (https://github.com/certifi/python-certifi/issues/26)
57-
certifi==2015.4.28
56+
certifi==2021.5.30

tasks.py

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,6 @@
66
CONSTRAINTS_FILE = 'constraints.txt'
77

88

9-
def monkey_patch(ctx):
10-
# Force an older cacert.pem from certifi v2015.4.28, prevents an ssl failure w/ identity.api.rackspacecloud.com.
11-
#
12-
# SubjectAltNameWarning: Certificate for identity.api.rackspacecloud.com has no `subjectAltName`, falling
13-
# back to check for a `commonName` for now. This feature is being removed by major browsers and deprecated by
14-
# RFC 2818. (See https://github.com/shazow/urllib3/issues/497 for details.)
15-
# SubjectAltNameWarning
16-
import ssl
17-
import certifi
18-
19-
_create_default_context = ssl.create_default_context
20-
21-
def create_default_context(purpose=ssl.Purpose.SERVER_AUTH, *, cafile=None, capath=None, cadata=None):
22-
if cafile is None:
23-
cafile = certifi.where()
24-
return _create_default_context(purpose=purpose, cafile=cafile, capath=capath, cadata=cadata)
25-
ssl.create_default_context = create_default_context
26-
27-
289
@task
2910
def wheelhouse(ctx, develop=False):
3011
req_file = 'dev-requirements.txt' if develop else 'requirements.txt'
@@ -75,8 +56,6 @@ def test(ctx, verbose=False, nocov=False, extension=None, path=None):
7556

7657
@task
7758
def server(ctx):
78-
monkey_patch(ctx)
79-
8059
if os.environ.get('REMOTE_DEBUG', None):
8160
import pydevd
8261
# e.g. '127.0.0.1:5678'

0 commit comments

Comments
 (0)