From cbe73cfe6456a6f1b6e01592d6b26fbdd68cb4d2 Mon Sep 17 00:00:00 2001 From: Sean McGinnis Date: Fri, 10 Apr 2020 10:13:30 -0500 Subject: [PATCH] Cap hacking for py2 support This caps the version of hacking used, and the linters that it ends up pulling in, to still work with python 2. Updates the way requirements are installed for the pep8 job to pull in all test-requirements. Change-Id: Ifdcb3ca27c50a182c06d9bf39c518a24ea0b3472 Signed-off-by: Sean McGinnis --- test-requirements.txt | 1 + tox.ini | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/test-requirements.txt b/test-requirements.txt index cf5a8d100..62a8d99e4 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,6 +1,7 @@ # The order of packages is significant, because pip processes them in the order # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. +hacking!=0.13.0,<0.14,>=0.12.0,<2 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 fixtures>=3.0.0 # Apache-2.0/BSD mock>=2.0.0 # BSD diff --git a/tox.ini b/tox.ini index 9d32cd75f..a75a0160b 100644 --- a/tox.ini +++ b/tox.ini @@ -31,8 +31,8 @@ usedevelop = False skip_install = True deps = -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} + -r{toxinidir}/test-requirements.txt doc8 - hacking pygments commands = doc8 doc/source