Update etcd, urllib3, pyopenssl versions in travis builds

Specifically, use the latest pyopenssl, a fairly recent urllib3, and the
most recent version of etcd 2.x

Author: lavagetto

.travis.yml

@@ -4,7 +4,7 @@ python:
   - "3.5"
 
 before_install:
-  - ./build_etcd.sh v2.2.0
+  - ./download_etcd.sh 2.3.7
   - pip install --upgrade setuptools
 
 # command to install dependencies
@@ -16,7 +16,7 @@ install:
 
 # command to run tests
 script:
-  PATH=$PATH:./etcd/bin coverage run --source=src/etcd --omit="src/etcd/tests/*" bin/test
+  PATH=$PATH:./bin coverage run --source=src/etcd --omit="src/etcd/tests/*" bin/test
 
 after_success: coveralls
 # Add env var to detect it during build

build_etcd.sh

@@ -9,10 +9,16 @@ fi
 
 echo "Using ETCD version $ETCD_VERSION"
 
+BASE=$PWD
+mkdir -p gopath/src/coreos/
+export GOPATH=$BASE/gopath/
+cd $GOPATH/src/coreos
 git clone https://github.com/coreos/etcd.git
 cd etcd
-git checkout $ETCD_VERSION
+git checkout -b buildout $ETCD_VERSION
 ./build
+cd $BASE
+cp -r $GOPATH/src/coreos/etcd/bin .
 
 
 ${TRAVIS:?"This is not a Travis build. All Done"}

buildout.cfg

@@ -5,8 +5,8 @@ parts = python
       coverage
 develop = .
 eggs = 
-     urllib3==1.7.1
-     pyOpenSSL==0.13.1
+     urllib3==1.19.1
+     pyOpenSSL==16.2
      ${deps:extraeggs}
 
 [python]

download_etcd.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+set -e
+VERSION=${1:-2.3.7}
+mkdir -p bin
+URL="https://github.com/coreos/etcd/releases/download/v${VERSION}/etcd-v${VERSION}-linux-amd64.tar.gz"
+curl -L $URL | tar -C ./bin --strip-components=1 -xzvf - "etcd-v${VERSION}-linux-amd64/etcd"