From 3fcc878e4066bbef45d2883326993a3f97c0a580 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Mon, 22 Feb 2021 11:49:40 +0200 Subject: [PATCH 1/2] tox: Specify extra requirements Without this new pip will notice the conflict between securesystemslib (git master) securesystemslib[crypto,pynacl] >= 0.18 The former does not have the extras as it should. Add the extras and also do not accept plain http for anything. Signed-off-by: Jussi Kukkonen --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index acf80441..930e6206 100644 --- a/tox.ini +++ b/tox.ini @@ -32,7 +32,7 @@ install_command = pip install --use-deprecated=legacy-resolver --pre {opts} {pac # Must to be invoked explicitly with, e.g. `tox -e with-sslib-master` [testenv:with-sslib-master] deps = - git+http://github.com/secure-systems-lab/securesystemslib.git@master#egg=securesystemslib + git+https://github.com/secure-systems-lab/securesystemslib.git@master#egg=securesystemslib[crypto,pynacl] -r{toxinidir}/requirements-test.txt --editable {toxinidir} From 2de2758393883ae0f96c30b43cc6b2b2107bf921 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Mon, 22 Feb 2021 11:07:45 +0200 Subject: [PATCH 2/2] ci: Remove workaround for pip resolver issue Workaround was added for pip issue 9215 and does not _seem_ to appear anymore with pip 21.0.1. Signed-off-by: Jussi Kukkonen --- tox.ini | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tox.ini b/tox.ini index 930e6206..df6b8e24 100644 --- a/tox.ini +++ b/tox.ini @@ -24,9 +24,7 @@ deps = # installation (see `skipsdist`), to get relative paths in coverage reports --editable {toxinidir} -# FIXME: use legacy resolver because https://github.com/pypa/pip/issues/9215 -install_command = pip install --use-deprecated=legacy-resolver --pre {opts} {packages} - +install_command = pip install --pre {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`