Visitar URL original
travis says matrix is alias for jobs now · httplib2/httplib2@0d490f6 · GitHub
Skip to content

Commit 0d490f6

Browse files
committed
travis says matrix is alias for jobs now
Full CI revealed PEP8 error and openssl1.1.1c was not available anymore.
1 parent 0effb93 commit 0d490f6

3 files changed

Lines changed: 6 additions & 9 deletions

File tree

‎.travis.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,14 @@ python:
1616
- 3.5
1717
- 3.6
1818
- 3.7
19-
matrix:
20-
fast_finish: true
2119
install: pip install $pip_install_common 'codecov>=2.0.15' -r requirements-test.txt
2220
script: script/test -sv && codecov
2321

2422
stages:
2523
- test
2624
- release
2725
jobs:
26+
fast_finish: true
2827
include:
2928
- stage: test
3029
python: pypy
@@ -69,7 +68,7 @@ jobs:
6968
deploy:
7069
provider: pypi
7170
server: https://test.pypi.org/legacy/
72-
user: httplib2.release.test
71+
username: httplib2.release.test
7372
password:
7473
secure: "XN3oxobC+26UPiS+F1MvL4c6XtytejZ13SkLXCHfgVDPSASzKqF81CnR4EhsnbfZLvSgGHgSlfY5Jve5HF2VR9GzpJMc6wzcfkkeBg6PeRHuMppIqmuoq7BTw81SZL9X62/mju/vxXs2cHpVkwNTSE7W1JH1bVXPj86oAR9xXo9waRuXcyPGNuSqmOd1NPOMbFmeuz+HeArk2Fz7wwo6H5BJuXjOrEOHWD1rzeRchH901PBUrftm54Id2TIVMARW8jm1saQY2FtPWaBv2v/DJC1fKWMJpcNQ3mmcvrrTFC1IJ00dk9XJfqx5hnsRaergc0UvzHoOGEQKSMdg0PUAkvNohAoCf+3GddPkvk8MaZ+aQlijoK6wp93A5dfTxBVZqdhmEdheolbYiJPunzS60bWvaEv6/D15/xyMiwGamUmF1Tx7UIvvm/zj6tAOBWbNEgLRyvQ0qx2RE95GLtp+RXK4pT+Kig1+cof5hrWODuEl1SSLMBySaNLWO73IN9esZu0X1JS7svnROLRJCAvRjppJYswwCPziP+B8XQDeMrhIDMHNzdbtxOPpBAXpYUE764FkzaUTMsK83Q+ugE3Dx8xtrAzT4M0fdiFv+3QEhSUtfvWsLH9zS9wXC5Px9kPKU3FO8mdUyf7A0bIasvJLNcApDJigKjBukToOIsZVFok="
7574
distributions: "sdist bdist_wheel"
@@ -84,7 +83,7 @@ jobs:
8483
script: script/release -auto
8584
deploy:
8685
provider: pypi
87-
user: httplib2.release
86+
username: httplib2.release
8887
password:
8988
secure: "jZAyMFnmbhYChjsb3gRYfESWlio6pgmWEWBRxtBQXYZf+tzyKVISyHuyWkJvOVTP+lOpp2MTPZ2s1UgxGwfzZ/VE034Cz5iA/C6wafmgtSW+wK+KEJFPseHBBA7Gh4ReiAPi2a+i1UXdsJpFNhv36E9tbTq2sEinbisE2lSEQ0KHadjkc+6pvCjlyhmes7QyM5GviWYlWRNj2OIkT8SUuUcWQt7ZEl6kN82MoMHCaf1YxE/i4JUP3VLomWK3RLZJP356Y4IDkzlVhFU4MJ4ubNtoQ/ECM0uQ+nsHzO0k1uGWdF6mMTna7U5gLqUi9rfCK3bLMeVSo+TUCpjI7HkWDaBgVXGTe5dUMJCDfRgqeYa0GnriI74XYJu8NGjMLv30uO58t9E7VQGo2NrFRJDzKAIHANejWnpUPY3XgoN1rlrh52seMjaU2+jO40EC8HvIqeRRwPwhkqCSV2y+IZT2bOFp2nbMWhkUMsxIX7OXt+sy8GvK/ilMleEl7r0tnudsT7lGdnMwXlttI3CIAFGE7E+0zwnxNiMzQDzo+ILVR7ezrCK9M9xVYKGa3i8gkpSn0Fblnltgg7HaEI8YC3rMZe4iu1t0D6cZZUAAp2ZUo3NCJcZ35iUFBhlFvjVDbe2upJgU6GFgtDLjyzCJiKbz8qLRgMFYgT0CGr512e1jBo0="
9089
distributions: "sdist bdist_wheel"

‎script/compile-py3-openssl11.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
cache_dir=$HOME/.cache
44
install_dir=$cache_dir/py3-openssl11
55
python_version="3.7.3"
6-
openssl_version="1.1.1c"
6+
openssl_version="1.1.1f"
77
cpucount=$(nproc --all)
88
export PYTHONDONTWRITEBYTECODE=1
99

@@ -14,7 +14,7 @@ if [[ $($install_dir/bin/python -V) != "Python $python_version" ]] ; then
1414
mkdir -p /tmp/source
1515
cd /tmp/source
1616
# Compile OpenSSL
17-
wget --quiet https://www.openssl.org/source/openssl-$openssl_version.tar.gz
17+
curl -fLOsS "https://www.openssl.org/source/openssl-$openssl_version.tar.gz"
1818
echo "Extracting OpenSSL..."
1919
tar xf openssl-$openssl_version.tar.gz
2020
cd ./openssl-$openssl_version
@@ -29,7 +29,7 @@ if [[ $($install_dir/bin/python -V) != "Python $python_version" ]] ; then
2929
cd /tmp/source
3030
sudo apt install -qq --yes libffi-dev
3131
# Compile latest Python
32-
wget --quiet https://www.python.org/ftp/python/$python_version/Python-$python_version.tar.xz
32+
curl -fLOsS "https://www.python.org/ftp/python/$python_version/Python-$python_version.tar.xz"
3333
echo "Extracting Python..."
3434
tar xf Python-$python_version.tar.xz
3535
cd ./Python-$python_version

‎tests/test_proxy.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,6 @@ def handler(request):
184184
return tests.http_response_bytes()
185185

186186
with tests.server_request(handler) as uri:
187-
uri_parsed = urllib.parse.urlparse(uri)
188187
monkeypatch.setenv("http_proxy", uri)
189188
monkeypatch.setenv("no_proxy", "*")
190189
http = httplib2.Http()
@@ -201,7 +200,6 @@ def handler(request):
201200
return tests.http_response_bytes()
202201

203202
with tests.server_request(handler, tls=True) as uri:
204-
uri_parsed = urllib.parse.urlparse(uri)
205203
monkeypatch.setenv("https_proxy", uri)
206204
monkeypatch.setenv("no_proxy", "*")
207205
http = httplib2.Http(ca_certs=tests.CA_CERTS)

0 commit comments

Comments
 (0)