Skip to content

Commit f2e825d

Browse files
ionelmcionelmc
committed
Use less env vars and fix yet again the six upgrade problem.
1 parent d873f84 commit f2e825d

File tree

3 files changed

+24
-44
lines changed

3 files changed

+24
-44
lines changed

‎.travis.yml

Lines changed: 16 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,12 @@ matrix:
3434
- WHEEL_PATH=.tox/dist
3535
- env:
3636
- TOXENV=py27-nocov
37-
- WHEEL_MANYLINUX_TAG=manylinux2014-arm
38-
- WHEEL_MANYLINUX_PYTHON=cp27
39-
- WHEEL_PATH=wheelhouse
37+
- WHEEL_MANYLINUX="2014-arm cp27"
4038
python: '2.7'
4139
arch: arm64
4240
- env:
4341
- TOXENV=py27-nocov
44-
- WHEEL_MANYLINUX_TAG=manylinux1
45-
- WHEEL_MANYLINUX_PYTHON=cp27
46-
- WHEEL_PATH=wheelhouse
42+
- WHEEL_MANYLINUX="1 cp27"
4743
python: '2.7'
4844
arch: amd64
4945
- env:
@@ -56,16 +52,12 @@ matrix:
5652
arch: amd64
5753
- env:
5854
- TOXENV=py35-nocov
59-
- WHEEL_MANYLINUX_TAG=manylinux2014-arm
60-
- WHEEL_MANYLINUX_PYTHON=cp35
61-
- WHEEL_PATH=wheelhouse
55+
- WHEEL_MANYLINUX="2014-arm cp35"
6256
python: '3.5'
6357
arch: arm64
6458
- env:
6559
- TOXENV=py35-nocov
66-
- WHEEL_MANYLINUX_TAG=manylinux1
67-
- WHEEL_MANYLINUX_PYTHON=cp35
68-
- WHEEL_PATH=wheelhouse
60+
- WHEEL_MANYLINUX="1 cp35"
6961
python: '3.5'
7062
arch: amd64
7163
- env:
@@ -78,16 +70,12 @@ matrix:
7870
arch: amd64
7971
- env:
8072
- TOXENV=py36-nocov
81-
- WHEEL_MANYLINUX_TAG=manylinux2014-arm
82-
- WHEEL_MANYLINUX_PYTHON=cp36
83-
- WHEEL_PATH=wheelhouse
73+
- WHEEL_MANYLINUX="2014-arm cp36"
8474
python: '3.6'
8575
arch: arm64
8676
- env:
8777
- TOXENV=py36-nocov
88-
- WHEEL_MANYLINUX_TAG=manylinux1
89-
- WHEEL_MANYLINUX_PYTHON=cp36
90-
- WHEEL_PATH=wheelhouse
78+
- WHEEL_MANYLINUX="1 cp36"
9179
python: '3.6'
9280
arch: amd64
9381
- env:
@@ -100,16 +88,12 @@ matrix:
10088
arch: amd64
10189
- env:
10290
- TOXENV=py37-nocov
103-
- WHEEL_MANYLINUX_TAG=manylinux2014-arm
104-
- WHEEL_MANYLINUX_PYTHON=cp37
105-
- WHEEL_PATH=wheelhouse
91+
- WHEEL_MANYLINUX="2014-arm cp37"
10692
python: '3.7'
10793
arch: arm64
10894
- env:
10995
- TOXENV=py37-nocov
110-
- WHEEL_MANYLINUX_TAG=manylinux1
111-
- WHEEL_MANYLINUX_PYTHON=cp37
112-
- WHEEL_PATH=wheelhouse
96+
- WHEEL_MANYLINUX="1 cp37"
11397
python: '3.7'
11498
arch: amd64
11599
- os: osx
@@ -133,16 +117,12 @@ matrix:
133117
- WHEEL_PATH=.tox/dist
134118
- env:
135119
- TOXENV=py38-nocov
136-
- WHEEL_MANYLINUX_TAG=manylinux2014-arm
137-
- WHEEL_MANYLINUX_PYTHON=cp38
138-
- WHEEL_PATH=wheelhouse
120+
- WHEEL_MANYLINUX="2014-arm cp38"
139121
python: '3.8'
140122
arch: arm64
141123
- env:
142124
- TOXENV=py38-nocov
143-
- WHEEL_MANYLINUX_TAG=manylinux1
144-
- WHEEL_MANYLINUX_PYTHON=cp38
145-
- WHEEL_PATH=wheelhouse
125+
- WHEEL_MANYLINUX="1 cp38"
146126
python: '3.8'
147127
arch: amd64
148128
before_install:
@@ -166,9 +146,10 @@ script:
166146
- |
167147
(
168148
set -eux
169-
if [[ -n ${WHEEL_MANYLINUX_TAG:-} ]]; then
170-
docker run --rm --user $UID -itv $(pwd):/code ionelmc/manylinux:$WHEEL_MANYLINUX_TAG $WHEEL_MANYLINUX_PYTHON
171-
tox --installpkg $WHEEL_PATH/*.whl -v
149+
if [[ -n ${WHEEL_MANYLINUX:-} ]]; then
150+
docker run --rm --user $UID -itv $(pwd):/code ionelmc/manylinux:manylinux$WHEEL_MANYLINUX
151+
tox --installpkg wheelhouse/*.whl -v
152+
export WHEEL_PATH=wheelhouse
172153
else
173154
tox -v
174155
fi
@@ -177,8 +158,8 @@ script:
177158
fi
178159
)
179160
after_failure:
180-
- more .tox/log/* | cat
181-
- more .tox/*/log/* | cat
161+
- cat .tox/log/*
162+
- cat .tox/*/log/*
182163
notifications:
183164
email:
184165
on_success: never

‎ci/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
virtualenv>=16.6.0
22
pip>=19.1.1
33
setuptools>=18.0.1
4-
six>=1.12.0
4+
six>=1.14.0

‎ci/templates/.travis.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@ matrix:
2929
- env:
3030
- TOXENV={{ env }}{% if 'cover' in env %},codecov,extension-coveralls,coveralls{% endif %}
3131
{%- if 'pypy' not in env and 'nocov' in env %}{{ '' }}
32-
- WHEEL_MANYLINUX_TAG=manylinux{% if arch == 'arm64' %}2014-arm{% else %}1{% endif %}{{ '' }}
33-
- WHEEL_MANYLINUX_PYTHON=cp{{ env.split('-')[0][2:] }}
34-
- WHEEL_PATH=wheelhouse
32+
- WHEEL_MANYLINUX="{% if arch == 'arm64' %}2014-arm{% else %}1{% endif %}{{ '' }} cp{{ env.split('-')[0][2:] }}"
3533
{%- elif 'pypy' not in env and 'nocov' in env %}{{ '' }}
3634
- WHEEL_PATH=.tox/dist
3735
{%- endif %}
@@ -68,9 +66,10 @@ script:
6866
- |
6967
(
7068
set -eux
71-
if [[ -n ${WHEEL_MANYLINUX_TAG:-} ]]; then
72-
docker run --rm --user $UID -itv $(pwd):/code ionelmc/manylinux:$WHEEL_MANYLINUX_TAG $WHEEL_MANYLINUX_PYTHON
73-
tox --installpkg $WHEEL_PATH/*.whl -v
69+
if [[ -n ${WHEEL_MANYLINUX:-} ]]; then
70+
docker run --rm --user $UID -itv $(pwd):/code ionelmc/manylinux:manylinux$WHEEL_MANYLINUX
71+
tox --installpkg wheelhouse/*.whl -v
72+
export WHEEL_PATH=wheelhouse
7473
else
7574
tox -v
7675
fi
@@ -79,8 +78,8 @@ script:
7978
fi
8079
)
8180
after_failure:
82-
- more .tox/log/* | cat
83-
- more .tox/*/log/* | cat
81+
- cat .tox/log/*
82+
- cat .tox/*/log/*
8483
notifications:
8584
email:
8685
on_success: never

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy