summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOmer Katz <omer.drow@gmail.com>2019-01-09 23:20:36 +0200
committerOmer Katz <omer.drow@gmail.com>2019-01-09 23:20:36 +0200
commit3ee3e2f48c1e7a0a07f64105b55ff729de4ed59b (patch)
treed2f4b81b3c082942dacaeee02b620e7cb21a94a7
parent57a67ffa114ffd2ef2dc472357d3571fdfd07a2e (diff)
downloadkombu-3ee3e2f48c1e7a0a07f64105b55ff729de4ed59b.tar.gz
revert.
-rw-r--r--.travis.yml5
-rw-r--r--tox.ini4
2 files changed, 3 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml
index 1c5b1619..75e57841 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,11 +27,8 @@ matrix:
before_install: sudo apt-get update && sudo apt-get install libgnutls-dev
- python: pypy
env: TOXENV=pypy
- - python: 3.7
- env: TOXENV=flake8
+ - env: TOXENV=flake8
stage: lint
- dist: xenial
- before_install: sudo apt-get update && sudo apt-get install libgnutls-dev
- env: TOXENV=flakeplus
stage: lint
- env: TOXENV=apicheck
diff --git a/tox.ini b/tox.ini
index 3236b2fc..33cd387a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -28,11 +28,11 @@ commands = pip install -U -r{toxinidir}/requirements/dev.txt
pytest -rxs -xv --cov=kombu --cov-report=xml --no-cov-on-fail {posargs}
basepython =
- 2.7,flakeplus,apicheck,linkcheck,cov,pydocstyle: python2.7
+ 2.7,flakeplus,flake8,apicheck,linkcheck,cov,pydocstyle: python2.7
3.4: python3.4
3.5: python3.5
3.6: python3.6
- 3.7,flake8: python3.7
+ 3.7: python3.7
pypy: pypy
[testenv:apicheck]