Skip to content

Commit

Permalink
Make the patch a bit leaner.
Browse files Browse the repository at this point in the history
  • Loading branch information
ionelmc committed Jul 17, 2020
1 parent c69b208 commit 1526b63
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 51 deletions.
96 changes: 48 additions & 48 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,133 +17,133 @@ matrix:
language: generic
env:
- TOXENV=py27-cover
- arch: amd64
env:
- env:
- TOXENV=py27-cover,codecov,extension-coveralls,coveralls
python: '2.7'
- arch: arm64
env:
arch: amd64
- env:
- TOXENV=py27-cover,codecov,extension-coveralls,coveralls
python: '2.7'
arch: arm64
- os: osx
language: generic
env:
- TOXENV=py27-nocov
- WHEEL_PATH=.tox/dist
- arch: amd64
env:
- env:
- TOXENV=py27-nocov
- WHEEL_MANYLINUX1=cp27
- WHEEL_PATH=wheelhouse
python: '2.7'
- arch: arm64
env:
arch: amd64
- env:
- TOXENV=py27-nocov
- WHEEL_PATH=.tox/dist
python: '2.7'
- arch: amd64
env:
arch: arm64
- env:
- TOXENV=py35-cover,codecov,extension-coveralls,coveralls
python: '3.5'
- arch: arm64
env:
arch: amd64
- env:
- TOXENV=py35-cover,codecov,extension-coveralls,coveralls
python: '3.5'
- arch: amd64
env:
arch: arm64
- env:
- TOXENV=py35-nocov
- WHEEL_MANYLINUX1=cp35
- WHEEL_PATH=wheelhouse
python: '3.5'
- arch: arm64
env:
arch: amd64
- env:
- TOXENV=py35-nocov
- WHEEL_PATH=.tox/dist
python: '3.5'
- arch: amd64
env:
arch: arm64
- env:
- TOXENV=py36-cover,codecov,extension-coveralls,coveralls
python: '3.6'
- arch: arm64
env:
arch: amd64
- env:
- TOXENV=py36-cover,codecov,extension-coveralls,coveralls
python: '3.6'
- arch: amd64
env:
arch: arm64
- env:
- TOXENV=py36-nocov
- WHEEL_MANYLINUX1=cp36
- WHEEL_PATH=wheelhouse
python: '3.6'
- arch: arm64
env:
arch: amd64
- env:
- TOXENV=py36-nocov
- WHEEL_PATH=.tox/dist
python: '3.6'
arch: arm64
- os: osx
language: generic
env:
- TOXENV=py37-cover
- arch: amd64
env:
- env:
- TOXENV=py37-cover,codecov,extension-coveralls,coveralls
python: '3.7'
- arch: arm64
env:
arch: amd64
- env:
- TOXENV=py37-cover,codecov,extension-coveralls,coveralls
python: '3.7'
arch: arm64
- os: osx
language: generic
env:
- TOXENV=py37-nocov
- WHEEL_PATH=.tox/dist
- arch: amd64
env:
- env:
- TOXENV=py37-nocov
- WHEEL_MANYLINUX1=cp37
- WHEEL_PATH=wheelhouse
python: '3.7'
- arch: arm64
env:
arch: amd64
- env:
- TOXENV=py37-nocov
- WHEEL_PATH=.tox/dist
python: '3.7'
- arch: amd64
env:
arch: arm64
- env:
- TOXENV=py38-cover,codecov,extension-coveralls,coveralls
python: '3.8'
- arch: arm64
env:
arch: amd64
- env:
- TOXENV=py38-cover,codecov,extension-coveralls,coveralls
python: '3.8'
- arch: amd64
env:
arch: arm64
- env:
- TOXENV=py38-nocov
- WHEEL_MANYLINUX1=cp38
- WHEEL_PATH=wheelhouse
python: '3.8'
- arch: arm64
env:
arch: amd64
- env:
- TOXENV=py38-nocov
- WHEEL_PATH=.tox/dist
python: '3.8'
- arch: amd64
env:
arch: arm64
- env:
- TOXENV=pypy-cover,codecov,extension-coveralls,coveralls
python: 'pypy'
- arch: amd64
env:
arch: amd64
- env:
- TOXENV=pypy-nocov
python: 'pypy'
- arch: amd64
env:
arch: amd64
- env:
- TOXENV=pypy3-cover,codecov,extension-coveralls,coveralls
- TOXPYTHON=pypy3
python: 'pypy3'
- arch: amd64
env:
arch: amd64
- env:
- TOXENV=pypy3-nocov
- TOXPYTHON=pypy3
python: 'pypy3'
arch: amd64
before_install:
- |
if [[ ${TRAVIS_CPU_ARCH} == "arm64" ]]; then
Expand Down
6 changes: 3 additions & 3 deletions ci/templates/.travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ matrix:
{%- endif %}{{ '' }}
{%- for arch in architecture %}{{ '' }}
{%- if 'arm64' not in arch or 'pypy' not in env %}{{ '' }}
- arch: {{ arch }}
env:
- env:
- TOXENV={{ env }}{% if 'cover' in env %},codecov,extension-coveralls,coveralls{% endif %}
{%- if 'pypy' not in env and 'nocov' in env and 'arm64' not in arch %}{{ '' }}
- WHEEL_MANYLINUX1=cp{{ env.split('-')[0][2:] }}
Expand All @@ -41,7 +40,8 @@ matrix:
python: 'pypy'
{%- else %}{{ '' }}
python: '{{ '{0[2]}.{0[3]}'.format(env) }}'
{%- endif %}
{%- endif %}{{ '' }}
arch: {{ arch }}
{%- endif %}{{ '' }}
{%- endfor %}{{ '' }}
{%- endfor %}{{ '' }}
Expand Down

0 comments on commit 1526b63

Please sign in to comment.