summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOmer Katz <omer.drow@gmail.com>2019-03-02 14:21:36 +0200
committerOmer Katz <omer.drow@gmail.com>2019-03-03 23:51:12 +0200
commite31f528ecc8522f48f1cc7a6352b95844e5d2b9a (patch)
tree863c06462e08334bcedd8f1316f11c54a00e2c29
parent63e8074ca154d9ce3a331bdf74ed9c9cf6a76d4b (diff)
downloadpy-amqp-e31f528ecc8522f48f1cc7a6352b95844e5d2b9a.tar.gz
Bump tox-pyo3.
-rw-r--r--.travis.yml8
-rw-r--r--tox.ini7
2 files changed, 12 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 277d4d2..c6c894a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,11 @@
language: python
sudo: required
dist: xenial
-cache: pip
+cache:
+ - pip: true
+ directories:
+ - $HOME/.cargo
+ - $TRAVIS_BUILD_DIR/target/debug/incremental
python:
- '2.7'
- '3.4'
@@ -57,7 +61,7 @@ before_install:
install:
- pip --disable-pip-version-check install -U pip setuptools wheel | cat
- - pip --disable-pip-version-check install -U tox pyo3-pack tox-pyo3 | cat
+ - pip --disable-pip-version-check install -U tox pyo3-pack tox-pyo3>=0.1.1 | cat
script: tox -v -- -v
after_success:
- .tox/$TRAVIS_PYTHON_VERSION/bin/coverage xml
diff --git a/tox.ini b/tox.ini
index 30f78dd..dbfc384 100644
--- a/tox.ini
+++ b/tox.ini
@@ -20,7 +20,7 @@ recreate = False
commands =
unit: py.test -xv --cov=amqp --cov-report=xml --no-cov-on-fail t/unit
integration: py.test -xv -E rabbitmq t/integration
-
+pyo3 = True
basepython =
2.7,flakeplus,flake8,apicheck,linkcheck,pydocstyle: python2.7
pypy2.7-6.0,pypy3.5-6.0: pypy
@@ -31,21 +31,26 @@ basepython =
install_command = python -m pip --disable-pip-version-check install {opts} {packages}
[testenv:apicheck]
+pyo3 = False
commands =
sphinx-build -b apicheck -d {envtmpdir}/doctrees docs docs/_build/apicheck
[testenv:linkcheck]
+pyo3 = False
commands =
sphinx-build -W -b linkcheck -d {envtmpdir}/doctrees docs docs/_build/linkcheck
[testenv:flake8]
+pyo3 = False
commands =
flake8 {toxinidir}/amqp {toxinidir}/t
[testenv:flakeplus]
+pyo3 = False
commands =
flakeplus --2.7 {toxinidir}/amqp {toxinidir}/t
[testenv:pydocstyle]
+pyo3 = False
commands =
pydocstyle {toxinidir}/amqp