Skip to content

Commit 3ac1885

Browse files
committed
Try another strategy for Travis
1 parent 003717f commit 3ac1885

File tree

1 file changed

+24
-38
lines changed

1 file changed

+24
-38
lines changed

.travis.yml

Lines changed: 24 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,32 @@
11
language: python
22

3-
python:
4-
- "3.6"
5-
63
matrix:
74
include:
8-
- env:
9-
- VENV='2.7'
10-
- PENDULUM_EXTENSIONS=0
11-
- env:
12-
- VENV='2.7'
13-
- PENDULUM_EXTENSIONS=1
14-
- env:
15-
- VENV='3.4'
16-
- PENDULUM_EXTENSIONS=0
17-
- env:
18-
- VENV='3.4'
19-
- PENDULUM_EXTENSIONS=1
20-
- env:
21-
- VENV='3.5'
22-
- PENDULUM_EXTENSIONS=0
23-
- env:
24-
- VENV='3.5'
25-
- PENDULUM_EXTENSIONS=1
26-
- env:
27-
- VENV=''
28-
- PENDULUM_EXTENSIONS=0
29-
- env:
30-
- VENV=''
31-
- PENDULUM_EXTENSIONS=1
32-
- env: VENV='pypy'
33-
- env: VENV='pypy3'
5+
- python: 2.7
6+
env: PENDULUM_EXTENSIONS=1
7+
- python: 2.7
8+
env: PENDULUM_EXTENSIONS=0
9+
- python: 3.4
10+
env: PENDULUM_EXTENSIONS=1
11+
- python: 3.4
12+
env: PENDULUM_EXTENSIONS=0
13+
- python: 3.5
14+
env: PENDULUM_EXTENSIONS=1
15+
- python: 3.5
16+
env: PENDULUM_EXTENSIONS=0
17+
- python: 3.6
18+
env: PENDULUM_EXTENSIONS=1
19+
- python: 3.6
20+
env: PENDULUM_EXTENSIONS=0
21+
- python: pypy
22+
- python: pypy3
3423

3524
before_install:
36-
- ls /opt/python/
3725
- pip install codecov
38-
- pip install poetry --pre
3926

4027
install:
4128
- |
42-
if [ "$VENV" = "pypy" ]; then
29+
if [ "$TRAVIS_PYTHON_VERSION" = "pypy" ]; then
4330
export PYENV_ROOT="$HOME/.pyenv"
4431
if [ -f "$PYENV_ROOT/bin/pyenv" ]; then
4532
pushd "$PYENV_ROOT" && git pull && popd
@@ -52,13 +39,12 @@ install:
5239
source "$HOME/virtualenvs/pypy-$PYPY_VERSION/bin/activate"
5340
fi
5441
- |
55-
if ([ "$VENV" != "" ] && [ "$VENV" != "pypy" ]); then
56-
virtualenv --python="$HOME/virtualenv/python$VENV/bin/python" "$HOME/virtualenvs/venv-$VENV"
57-
source "$HOME/virtualenvs/venv-$VENV/bin/activate"
42+
if [ "$TRAVIS_PYTHON_VERSION" != "3.6" ]; then
43+
virtualenv --python="$HOME/virtualenv/python3.6/bin/python" "$HOME/virtualenvs/venv-poetry"
5844
fi
59-
- $HOME/virtualenv/python$TRAVIS_PYTHON_VERSION/bin/poetry install -v
60-
- $HOME/virtualenv/python$TRAVIS_PYTHON_VERSION/bin/poetry build -v
61-
- pip --version
45+
- $HOME/virtualenvs/venv-poetry/bin/pip install poetry
46+
- $HOME/virtualenvs/venv-poetry/bin/poetry install -v
47+
- $HOME/virtualenvs/venv-poetry/bin/poetry build -v
6248
- find dist/ -iname pendulum*.tar.gz -exec pip install {} \;
6349

6450
script: pytest --cov=pendulum --cov-config=.coveragerc tests/

0 commit comments

Comments
 (0)