From 0870d53d84d687706fdee68d53bcf960099ee86c Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Thu, 26 Aug 2021 10:03:59 +0300 Subject: [PATCH] tox: Fix with-sslib-master install pip nowadays recognizes that we are asking for two different versions of securesystemslib in the "with-sslib-master" env, and errors out. Instead install normal dependencies first, then install the new securesystemslib separately (this ends up upgrading securesystemslib). Signed-off-by: Jussi Kukkonen --- tox.ini | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tox.ini b/tox.ini index 0334040e..4104104c 100644 --- a/tox.ini +++ b/tox.ini @@ -29,10 +29,8 @@ install_command = python3 -m pip install {opts} {packages} # Develop test env to run tests against securesystemslib's master branch # Must to be invoked explicitly with, e.g. `tox -e with-sslib-master` [testenv:with-sslib-master] -deps = - git+https://github.com/secure-systems-lab/securesystemslib.git@master#egg=securesystemslib[crypto,pynacl] - -r{toxinidir}/requirements-test.txt - --editable {toxinidir} +commands_pre = + python3 -m pip install git+https://github.com/secure-systems-lab/securesystemslib.git@master#egg=securesystemslib[crypto,pynacl] commands = python3 -m coverage run aggregate_tests.py