Skip to content

Commit 33737e2

Browse files
ionelmcionelmc
committed
Remove now-unnecessary travis cruft and fix doc envs to use py3.
1 parent 9f63f45 commit 33737e2

File tree

5 files changed

+45
-70
lines changed

5 files changed

+45
-70
lines changed

‎{{cookiecutter.repo_name}}/.travis.yml‎

Lines changed: 21 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,26 @@
11
language: python
2-
cache: pip
2+
dist: xenial
33
env:
44
global:
55
- LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
66
- SEGFAULT_SIGNALS=all
7-
matrix:
8-
- TOXENV=check
9-
{%- if cookiecutter.sphinx_docs == "yes" %}
10-
- TOXENV=docs
11-
{%- endif %}
127
matrix:
138
include:
9+
- python: '3.6'
10+
env:
11+
- TOXENV=check
12+
{%- if cookiecutter.sphinx_docs == "yes" %}
13+
- python: '3.6'
14+
env:
15+
- TOXENV=docs
16+
{%- endif %}
1417
{%- for env in ['py27', 'py34', 'py35', 'py36', 'py37', 'pypy', 'pypy3'] %}{{ '' }}
15-
- python: '{{ env.split("-")[0] if env.startswith("pypy") else "{0[2]}.{0[3]}".format(env) }}'
16-
{%- if env.startswith('py37') %}
17-
dist: xenial
18+
{%- if env.startswith("pypy3") %}
19+
- python: 'pypy3.5-6.0'
20+
{%- elif env.startswith("pypy") %}
21+
- python: 'pypy2.7-6.0'
22+
{%- else %}
23+
- python: '{{ "{0[2]}.{0[3]}".format(env) }}'
1824
{%- endif %}
1925
env:
2026
- TOXENV={{ env }}{% if cookiecutter.test_matrix_separate_coverage == 'yes' %}-cover{% endif %},report
@@ -23,9 +29,12 @@ matrix:
2329
{%- endif %}
2430
{%- if cookiecutter.codecov == 'yes' %},codecov{% endif %}
2531
{%- if cookiecutter.test_matrix_separate_coverage == 'yes' %}
26-
- python: '{{ env.split("-")[0] if env.startswith("pypy") else "{0[2]}.{0[3]}".format(env) }}'
27-
{%- if env.startswith('py37') %}
28-
dist: xenial
32+
{%- if env.startswith("pypy3") %}
33+
- python: 'pypy3.5-6.0'
34+
{%- elif env.startswith("pypy") %}
35+
- python: 'pypy2.7-6.0'
36+
{%- else %}
37+
- python: '{{ "{0[2]}.{0[3]}".format(env) }}'
2938
{%- endif %}
3039
env:
3140
- TOXENV={{ env }}-nocov
@@ -41,27 +50,6 @@ install:
4150
- easy_install --version
4251
- pip --version
4352
- tox --version
44-
- |
45-
set -ex
46-
if [[ $TRAVIS_PYTHON_VERSION == 'pypy' ]]; then
47-
(cd $HOME
48-
wget https://bitbucket.org/pypy/pypy/downloads/pypy2-v6.0.0-linux64.tar.bz2
49-
tar xf pypy2-*.tar.bz2
50-
pypy2-*/bin/pypy -m ensurepip
51-
pypy2-*/bin/pypy -m pip install -U virtualenv)
52-
export PATH=$(echo $HOME/pypy2-*/bin):$PATH
53-
export TOXPYTHON=$(echo $HOME/pypy2-*/bin/pypy)
54-
fi
55-
if [[ $TRAVIS_PYTHON_VERSION == 'pypy3' ]]; then
56-
(cd $HOME
57-
wget https://bitbucket.org/pypy/pypy/downloads/pypy3-v6.0.0-linux64.tar.bz2
58-
tar xf pypy3-*.tar.bz2
59-
pypy3-*/bin/pypy3 -m ensurepip
60-
pypy3-*/bin/pypy3 -m pip install -U virtualenv)
61-
export PATH=$(echo $HOME/pypy3-*/bin):$PATH
62-
export TOXPYTHON=$(echo $HOME/pypy3-*/bin/pypy3)
63-
fi
64-
set +x
6553
script:
6654
- tox -v
6755
after_failure:

‎{{cookiecutter.repo_name}}/ci/templates/.travis.yml‎

Lines changed: 21 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,28 @@
11
language: python
2-
cache: pip
2+
dist: xenial
33
env:
44
global:
55
- LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
66
- SEGFAULT_SIGNALS=all
7-
matrix:
8-
- TOXENV=check
9-
{%- if cookiecutter.sphinx_docs == "yes" %}
10-
- TOXENV=docs
11-
{%- endif %}
127
matrix:
138
include:
9+
- python: '3.6'
10+
env:
11+
- TOXENV=check
12+
{%- if cookiecutter.sphinx_docs == "yes" %}
13+
- python: '3.6'
14+
env:
15+
- TOXENV=docs
16+
{%- endif %}
1417
{% if cookiecutter.test_matrix_configurator == "yes" -%}
1518
{% raw -%}
1619
{%- for env, config in tox_environments|dictsort %}{{ '' }}
17-
- python: '{{ env.split("-")[0] if env.startswith("pypy") else "{0[2]}.{0[3]}".format(env) }}'
18-
{% if env.startswith('py37') %}
19-
dist: xenial
20+
{% if env.startswith("pypy3") %}
21+
- python: 'pypy3.5-6.0'
22+
{% elif env.startswith("pypy") %}
23+
- python: 'pypy2.7-6.0'
24+
{% else %}
25+
- python: '{{ "{0[2]}.{0[3]}".format(env) }}'
2026
{% endif %}
2127
env:
2228
- TOXENV={{ env }}{% if config.cover %},report{% endraw %}
@@ -30,9 +36,12 @@ matrix:
3036
{% else %}
3137
{%- raw -%}
3238
{%- for env in tox_environments %}{{ '' }}
33-
- python: '{{ env.split("-")[0] if env.startswith("pypy") else "{0[2]}.{0[3]}".format(env) }}'
34-
{% if env.startswith('py37') %}
35-
dist: xenial
39+
{% if env.startswith("pypy3") %}
40+
- python: 'pypy3.5-6.0'
41+
{% elif env.startswith("pypy") %}
42+
- python: 'pypy2.7-6.0'
43+
{% else %}
44+
- python: '{{ "{0[2]}.{0[3]}".format(env) }}'
3645
{% endif %}
3746
env:
3847
- TOXENV={{ env }}{% endraw -%}
@@ -63,27 +72,6 @@ install:
6372
- easy_install --version
6473
- pip --version
6574
- tox --version
66-
- |
67-
set -ex
68-
if [[ $TRAVIS_PYTHON_VERSION == 'pypy' ]]; then
69-
(cd $HOME
70-
wget https://bitbucket.org/pypy/pypy/downloads/pypy2-v6.0.0-linux64.tar.bz2
71-
tar xf pypy2-*.tar.bz2
72-
pypy2-*/bin/pypy -m ensurepip
73-
pypy2-*/bin/pypy -m pip install -U virtualenv)
74-
export PATH=$(echo $HOME/pypy2-*/bin):$PATH
75-
export TOXPYTHON=$(echo $HOME/pypy2-*/bin/pypy)
76-
fi
77-
if [[ $TRAVIS_PYTHON_VERSION == 'pypy3' ]]; then
78-
(cd $HOME
79-
wget https://bitbucket.org/pypy/pypy/downloads/pypy3-v6.0.0-linux64.tar.bz2
80-
tar xf pypy3-*.tar.bz2
81-
pypy3-*/bin/pypy3 -m ensurepip
82-
pypy3-*/bin/pypy3 -m pip install -U virtualenv)
83-
export PATH=$(echo $HOME/pypy3-*/bin):$PATH
84-
export TOXPYTHON=$(echo $HOME/pypy3-*/bin/pypy3)
85-
fi
86-
set +x
8775
script:
8876
- tox -v
8977
after_failure:

‎{{cookiecutter.repo_name}}/ci/templates/tox.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ envlist =
1313
[testenv]
1414
basepython =
1515
{%- if cookiecutter.sphinx_docs == "yes" %}
16-
{docs,spell}: {env:TOXPYTHON:python2.7}
16+
{docs,spell}: {env:TOXPYTHON:python3.6}
1717
{%- endif %}
1818
{bootstrap,clean,check,report{%- if cookiecutter.codecov == 'yes' %},codecov{% endif %}{% if cookiecutter.coveralls == 'yes' %},coveralls{% if cookiecutter.c_extension_support != "no" %},extension-coveralls{% endif %}{% endif %}}: {env:TOXPYTHON:python3}
1919
setenv =

‎{{cookiecutter.repo_name}}/setup.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
from __future__ import print_function
55

66
import io
7-
87
{% if cookiecutter.c_extension_support != 'no' -%}
98
import os
109
{% endif -%}

‎{{cookiecutter.repo_name}}/tox.ini‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ envlist =
3232
basepython =
3333
pypy: {env:TOXPYTHON:pypy}
3434
pypy3: {env:TOXPYTHON:pypy3}
35-
{% if cookiecutter.sphinx_docs == "yes" %}{py27,docs,spell}{% else %}py27{% endif %}: {env:TOXPYTHON:python2.7}
35+
py27: {env:TOXPYTHON:python2.7}
3636
py34: {env:TOXPYTHON:python3.4}
3737
py35: {env:TOXPYTHON:python3.5}
38-
py36: {env:TOXPYTHON:python3.6}
38+
{% if cookiecutter.sphinx_docs == "yes" %}{py36,docs,spell}{% else %}py36{% endif %}: {env:TOXPYTHON:python3.6}
3939
py37: {env:TOXPYTHON:python3.7}
4040
{bootstrap,clean,check,report{%- if cookiecutter.codecov == 'yes' %},codecov{% endif %}{% if cookiecutter.coveralls == 'yes' %},coveralls{% if cookiecutter.c_extension_support != "no" %},extension-coveralls{% endif %}{% endif %}}: {env:TOXPYTHON:python3}
4141
setenv =

0 commit comments

Comments
 (0)