summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorScott Moser <smoser@brickies.net>2017-08-30 10:35:30 -0400
committerScott Moser <smoser@brickies.net>2017-08-30 14:14:23 -0400
commit502082f6f21fb7592a798087a4c49f90d886ad14 (patch)
treece4d4548d3849bfd654000c3818c7ba31f7b05fb /tox.ini
parentcbda576a7bbf846710ad55940bf8ca1f2d2194b9 (diff)
downloadvyos-cloud-init-502082f6f21fb7592a798087a4c49f90d886ad14.tar.gz
vyos-cloud-init-502082f6f21fb7592a798087a4c49f90d886ad14.zip
tox: make xenial environment run with python3.6
The pinned versions of python packages in xenial do not work with python3.6. Currently, the failure can be seen with: $ tox -e xenial tests/unittests/test_merging.py which ends up failing with in /usr/lib/python3.6/inspect.py with: ValueError: Function has keyword-only parameters or annotations, use getfullargspec() API which can support them Instead of setting 'basepython' to 3.5 for the 'xenial', we just update the one package that does not run correctly with python3.6. That allows the developer to have either python3.5 or python3.6 installed and have tox work as expected.
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini6
1 files changed, 4 insertions, 2 deletions
diff --git a/tox.ini b/tox.ini
index a17156ce..ec96e859 100644
--- a/tox.ini
+++ b/tox.ini
@@ -66,8 +66,10 @@ deps =
pyserial==3.0.1
configobj==5.0.6
requests==2.9.1
- # jsonpatch ubuntu is 1.10, not 1.19 (#839779)
- jsonpatch==1.10
+ # 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.8.6