Add requirements for correct SAN parsing by urllib3

projectcalico · Oct 13, 2016 · 8646c6d · 8646c6d
1 parent 56ef096
commit 8646c6d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/Dockerfile.calico_test b/Dockerfile.calico_test
@@ -42,7 +42,7 @@ MAINTAINER Tom Denham <tom@projectcalico.org>
 # We install glibc onto the official docker image (instead of adding docker to 
 # the libc image) since glibc installs are more constant than the 
 # docker-in-docker installation and configuration.
-RUN apk add --update python python-dev py-pip py-setuptools \
+RUN apk add --update python python-dev py-pip py-setuptools openssl-dev libffi-dev \
         git musl-dev gcc \
         iptables ip6tables iproute2 iputils ipset curl && \
         curl -o glibc.apk -L "https://github.com/andyshinn/alpine-pkg-glibc/releases/download/2.23-r1/glibc-2.23-r1.apk" && \

diff --git a/build-requirements-frozen.txt b/build-requirements-frozen.txt
@@ -12,6 +12,6 @@ PyYAML==3.11
 requests==2.9.1
 six==1.10.0
 subprocess32==3.2.7
-urllib3==1.14
+urllib3==1.18
 virtualenv==12.1.1
 websocket-client==0.35.0
diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,6 @@
 netaddr
 python-etcd
 subprocess32
+pyopenssl 
+ndg-httpsclient
+pyasn1
diff --git a/setup.py b/setup.py
@@ -57,7 +57,8 @@
     # your project is installed. For an analysis of "install_requires" vs pip's
     # requirements files see:
     # https://packaging.python.org/en/latest/requirements.html
-    install_requires=['netaddr', 'python-etcd>=0.4.3', 'subprocess32'],
+    install_requires=['netaddr', 'python-etcd>=0.4.3', 'subprocess32',
+                      'pyopenssl', 'ndg-httpsclient', 'pyasn1'],
     dependency_links=[
         "git+https://github.com/jplana/python-etcd.git@0d0145f5e835aa032c97a0a5e09c4c68b7a03f66#egg=python-etcd-0.4.3"
     ]