From e103baa002e54303b08630c436dfc7b0b8a013de Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Fri, 8 Jan 2021 10:45:10 +0000 Subject: pre-commit: Resolve dependency conflicts hacking 3.1.0 depended on 'flake8<3.8.0,>=3.6.0', while we were specifying flake 3.8.3. This resulted in an error when using the dependency resolver introduced in pip 20.3. Resolve this by bumping to hacking 3.2.0. We also remove bandit and pre-commit from test-requirements, since these are linters which are not managed by upper-constraints and are not necessary to run tests. oslo.context is also specified in both requirements.txt and test-requirements.txt, so we remove it from the latter. Change-Id: I829870c327b73b583877b9b969ee38f0bcaa1495 Signed-off-by: Stephen Finucane --- test-requirements.txt | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'test-requirements.txt') diff --git a/test-requirements.txt b/test-requirements.txt index fb0d03a..3717b43 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,16 +1,11 @@ # 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>=3.0.1,<3.1.0 # Apache-2.0 + oslotest>=3.2.0 # Apache-2.0 requests-mock>=1.2.0 # Apache-2.0 stestr>=2.0.0 # Apache-2.0 -oslo.context>=2.22.0 # Apache-2.0 +sphinx>=2.0.0,!=2.1.0 # BSD # computes code coverage percentages coverage!=4.4,>=4.0 # Apache-2.0 - -# Bandit security code scanner -bandit>=1.6.0,<1.7.0 # Apache-2.0 - -pre-commit>=2.6.0 # MIT -- cgit v1.2.1