diff --git a/.travis.yml b/.travis.yml index ca91b60e..395c5078 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,8 +16,6 @@ python: - 3.5 - 3.6 - 3.7 -matrix: - fast_finish: true install: pip install $pip_install_common 'codecov>=2.0.15' -r requirements-test.txt script: script/test -sv && codecov @@ -25,6 +23,7 @@ stages: - test - release jobs: + fast_finish: true include: - stage: test python: pypy @@ -69,7 +68,7 @@ jobs: deploy: provider: pypi server: https://test.pypi.org/legacy/ - user: httplib2.release.test + username: httplib2.release.test password: secure: "XN3oxobC+26UPiS+F1MvL4c6XtytejZ13SkLXCHfgVDPSASzKqF81CnR4EhsnbfZLvSgGHgSlfY5Jve5HF2VR9GzpJMc6wzcfkkeBg6PeRHuMppIqmuoq7BTw81SZL9X62/mju/vxXs2cHpVkwNTSE7W1JH1bVXPj86oAR9xXo9waRuXcyPGNuSqmOd1NPOMbFmeuz+HeArk2Fz7wwo6H5BJuXjOrEOHWD1rzeRchH901PBUrftm54Id2TIVMARW8jm1saQY2FtPWaBv2v/DJC1fKWMJpcNQ3mmcvrrTFC1IJ00dk9XJfqx5hnsRaergc0UvzHoOGEQKSMdg0PUAkvNohAoCf+3GddPkvk8MaZ+aQlijoK6wp93A5dfTxBVZqdhmEdheolbYiJPunzS60bWvaEv6/D15/xyMiwGamUmF1Tx7UIvvm/zj6tAOBWbNEgLRyvQ0qx2RE95GLtp+RXK4pT+Kig1+cof5hrWODuEl1SSLMBySaNLWO73IN9esZu0X1JS7svnROLRJCAvRjppJYswwCPziP+B8XQDeMrhIDMHNzdbtxOPpBAXpYUE764FkzaUTMsK83Q+ugE3Dx8xtrAzT4M0fdiFv+3QEhSUtfvWsLH9zS9wXC5Px9kPKU3FO8mdUyf7A0bIasvJLNcApDJigKjBukToOIsZVFok=" distributions: "sdist bdist_wheel" @@ -84,7 +83,7 @@ jobs: script: script/release -auto deploy: provider: pypi - user: httplib2.release + username: httplib2.release password: secure: "jZAyMFnmbhYChjsb3gRYfESWlio6pgmWEWBRxtBQXYZf+tzyKVISyHuyWkJvOVTP+lOpp2MTPZ2s1UgxGwfzZ/VE034Cz5iA/C6wafmgtSW+wK+KEJFPseHBBA7Gh4ReiAPi2a+i1UXdsJpFNhv36E9tbTq2sEinbisE2lSEQ0KHadjkc+6pvCjlyhmes7QyM5GviWYlWRNj2OIkT8SUuUcWQt7ZEl6kN82MoMHCaf1YxE/i4JUP3VLomWK3RLZJP356Y4IDkzlVhFU4MJ4ubNtoQ/ECM0uQ+nsHzO0k1uGWdF6mMTna7U5gLqUi9rfCK3bLMeVSo+TUCpjI7HkWDaBgVXGTe5dUMJCDfRgqeYa0GnriI74XYJu8NGjMLv30uO58t9E7VQGo2NrFRJDzKAIHANejWnpUPY3XgoN1rlrh52seMjaU2+jO40EC8HvIqeRRwPwhkqCSV2y+IZT2bOFp2nbMWhkUMsxIX7OXt+sy8GvK/ilMleEl7r0tnudsT7lGdnMwXlttI3CIAFGE7E+0zwnxNiMzQDzo+ILVR7ezrCK9M9xVYKGa3i8gkpSn0Fblnltgg7HaEI8YC3rMZe4iu1t0D6cZZUAAp2ZUo3NCJcZ35iUFBhlFvjVDbe2upJgU6GFgtDLjyzCJiKbz8qLRgMFYgT0CGr512e1jBo0=" distributions: "sdist bdist_wheel" diff --git a/script/compile-py3-openssl11.sh b/script/compile-py3-openssl11.sh index 34860430..59f50229 100644 --- a/script/compile-py3-openssl11.sh +++ b/script/compile-py3-openssl11.sh @@ -3,7 +3,7 @@ cache_dir=$HOME/.cache install_dir=$cache_dir/py3-openssl11 python_version="3.7.3" -openssl_version="1.1.1c" +openssl_version="1.1.1f" cpucount=$(nproc --all) export PYTHONDONTWRITEBYTECODE=1 @@ -14,7 +14,7 @@ if [[ $($install_dir/bin/python -V) != "Python $python_version" ]] ; then mkdir -p /tmp/source cd /tmp/source # Compile OpenSSL - wget --quiet https://www.openssl.org/source/openssl-$openssl_version.tar.gz + curl -fLOsS "https://www.openssl.org/source/openssl-$openssl_version.tar.gz" echo "Extracting OpenSSL..." tar xf openssl-$openssl_version.tar.gz cd ./openssl-$openssl_version @@ -29,7 +29,7 @@ if [[ $($install_dir/bin/python -V) != "Python $python_version" ]] ; then cd /tmp/source sudo apt install -qq --yes libffi-dev # Compile latest Python - wget --quiet https://www.python.org/ftp/python/$python_version/Python-$python_version.tar.xz + curl -fLOsS "https://www.python.org/ftp/python/$python_version/Python-$python_version.tar.xz" echo "Extracting Python..." tar xf Python-$python_version.tar.xz cd ./Python-$python_version diff --git a/tests/test_proxy.py b/tests/test_proxy.py index 61d9502b..edafe01c 100644 --- a/tests/test_proxy.py +++ b/tests/test_proxy.py @@ -184,7 +184,6 @@ def handler(request): return tests.http_response_bytes() with tests.server_request(handler) as uri: - uri_parsed = urllib.parse.urlparse(uri) monkeypatch.setenv("http_proxy", uri) monkeypatch.setenv("no_proxy", "*") http = httplib2.Http() @@ -201,7 +200,6 @@ def handler(request): return tests.http_response_bytes() with tests.server_request(handler, tls=True) as uri: - uri_parsed = urllib.parse.urlparse(uri) monkeypatch.setenv("https_proxy", uri) monkeypatch.setenv("no_proxy", "*") http = httplib2.Http(ca_certs=tests.CA_CERTS)