summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorDaniel Watkins <oddbloke@ubuntu.com>2020-03-10 22:49:52 -0400
committerGitHub <noreply@github.com>2020-03-10 20:49:52 -0600
commit9b2e42c5cdf458de1cd7c08e554511ea04873d55 (patch)
treed15306844eb645c2a563f8795e8b36b68e662a78 /tox.ini
parentaea652990cc3d39e5b5e5dbddd1d8190a4621563 (diff)
downloadvyos-cloud-init-9b2e42c5cdf458de1cd7c08e554511ea04873d55.tar.gz
vyos-cloud-init-9b2e42c5cdf458de1cd7c08e554511ea04873d55.zip
tox.ini: use xenial version of jsonpatch in CI (#242)
Now that we can distinguish between CI xenial dependencies and needed-to-run-on-dev-machine xenial depedencies, we can return to testing with the correct jsonpatch version.
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini9
1 files changed, 5 insertions, 4 deletions
diff --git a/tox.ini b/tox.ini
index 0f9db826..d17f493d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -72,10 +72,6 @@ deps =
pyserial==3.0.1
configobj==5.0.6
requests==2.9.1
- # jsonpatch in xenial is 1.10, not 1.19 (#839779). The oldest version
- # to work with python3.6 is 1.16 as found in Artful. To keep default
- # invocation of 'tox' happy, accept the difference in version here.
- jsonpatch==1.16
six==1.10.0
# test-requirements
httpretty==0.9.6
@@ -91,6 +87,7 @@ basepython = python3
deps =
# Refer to the comment in [xenial-shared-deps] for details
{[xenial-shared-deps]deps}
+ jsonpatch==1.10
pytest==2.8.7
[testenv:xenial-dev]
@@ -99,6 +96,10 @@ basepython = {[testenv:xenial]basepython}
deps =
# Refer to the comment in [xenial-shared-deps] for details
{[xenial-shared-deps]deps}
+ # jsonpatch in xenial is 1.10, not 1.19 (#839779). The oldest version
+ # to work with python3.6 is 1.16 as found in Artful. To keep default
+ # invocation of 'tox' happy, accept the difference in version here.
+ jsonpatch==1.16
pytest==3.0.7
[testenv:tip-pycodestyle]