Skip to content

Commit d858bb8

Browse files
authored
travis: Tweak caching, dev dependencies, rm old pytest invocation (#528)
2 parents c168eca + 58e4283 commit d858bb8

File tree

7 files changed

+237
-32
lines changed

7 files changed

+237
-32
lines changed

.travis.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,14 @@ matrix:
3030
- env: TMUX_VERSION=master
3131
cache:
3232
- pip
33+
- apt
3334
- directories:
3435
- ~/source
3536
- ~/build
36-
before_install:
37-
- export PIP_USE_MIRRORS=true
38-
- pip install --upgrade pytest # https://github.com/travis-ci/travis-ci/issues/4873
39-
- pip install --upgrade pip wheel virtualenv setuptools
40-
- pip install pytest-cov coverage codecov flake8
4137
install:
4238
- pip install -e .
4339
- pip install -r requirements/test.txt
40+
- pip install -r requirements/dev.txt
4441
before_script:
4542
- mkdir -p ~/source
4643
- mkdir -p ~/build/tmux-$TMUX_VERSION

Pipfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ libtmux = "<0.9"
2525
click = ">=7<8"
2626
colorama = "*"
2727
e1839a8 = {path = ".",editable = true}
28+
pytest-cov = "*"
29+
coverage = "*"
30+
codecov = "*"
2831

2932
[requires]
3033
python_version = "3"

Pipfile.lock

Lines changed: 223 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

doc/_ext/aafig.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ def render_aafigure(app, text, options):
183183
try:
184184
f = open(metadata_fname, 'r')
185185
extra = f.read()
186-
except:
186+
except Exception:
187187
raise AafigError()
188188
finally:
189189
if f is not None:

requirements/dev.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
isort>=4.3.4
2-
flake8>=3.5.0
3-
twine>=1.13.0
1+
isort<5
2+
flake8<4
3+
twine

requirements/test.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1-
pytest>=3.9.1
2-
pytest-rerunfailures>=4.2
1+
pytest<6
2+
pytest-rerunfailures<9
3+
pytest-cov
4+
coverage
5+
codecov

0 commit comments

Comments
 (0)