summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Clauss <cclauss@me.com>2020-07-28 15:00:43 +0200
committerGitHub <noreply@github.com>2020-07-28 16:00:43 +0300
commitb4581289fa140fdbccef9f09b9fc8a3ba44e90a7 (patch)
treef60f5ad696399ba126002b7ded730b492f5ba0d9
parent016f4accb634ebc3eb8fc66741f23552e5966ea7 (diff)
downloadkombu-b4581289fa140fdbccef9f09b9fc8a3ba44e90a7.tar.gz
tox.ini: Lint on Python, not on legacy Python (#1217)
* tox.ini: Lint on Python, not on legacy Python * Travis CI: Lint on Python, not on legacy Python * Update .travis.yml * Update .travis.yml Co-authored-by: Omer Katz <omer.drow@gmail.com> * flakeplus only works on legacy Python Co-authored-by: Omer Katz <omer.drow@gmail.com>
-rw-r--r--.travis.yml9
-rw-r--r--tox.ini4
2 files changed, 7 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml
index ac321744..15e8acf9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
os: linux
+dist: xenial
language: python
cache: pip
@@ -40,13 +41,13 @@ jobs:
env: TOXENV=3.8-linux-unit
- python: pypy2.7-7.1.1
env: TOXENV=pypy-unit
- dist: xenial
- python: pypy3.5-7.0
env: TOXENV=pypy3-unit
- dist: xenial
- - env: TOXENV=flake8
+ - python: '3.8'
+ env: TOXENV=flake8
stage: lint
- - env: TOXENV=flakeplus
+ - python: '2.7'
+ env: TOXENV=flakeplus
stage: lint
- python: '3.6'
env: TOXENV=apicheck
diff --git a/tox.ini b/tox.ini
index 3d665f4f..031a05cc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -31,11 +31,11 @@ commands =
integration-redis: py.test -xv -E redis t/integration {posargs:-n2}
basepython =
- 2.7,flakeplus,flake8,linkcheck,cov: python2.7
+ 2.7,flakeplus: python2.7
3.5: python3.5
3.6,apicheck,pydocstyle: python3.6
3.7: python3.7
- 3.8: python3.8
+ 3.8,flake8,linkcheck,cov: python3.8
pypy,pypy3: pypy
install_command = python -m pip --disable-pip-version-check install {opts} {packages}