From 5afd51e8cf47a9eb8e41b24381b0b1d94686ca2e Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sun, 4 Feb 2024 23:51:57 +0900 Subject: [PATCH] Drop unused pymongodb from requirements Keystone no longer depends on mongodb after cache implementation was split to oslo.cache[1]. Also, bandit is not a runtime dependency but a test dependency, so should live in test requirements. [1] 4969f66fca37ce9bd654cf74890fa28dd011bc6e Change-Id: I85f376d0897dd6b4dba758f86882fae70511fb6a --- setup.cfg | 4 ---- test-requirements.txt | 2 ++ tox.ini | 6 ++---- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/setup.cfg b/setup.cfg index 7d0136ad16..bce351e7a8 100644 --- a/setup.cfg +++ b/setup.cfg @@ -35,10 +35,6 @@ ldap = ldappool>=2.3.1 # MPL memcache = python-memcached>=1.56 # PSF -mongodb = - pymongo!=3.1,>=3.0.2 # Apache-2.0 -bandit = - bandit>=1.1.0 # Apache-2.0 [entry_points] console_scripts = diff --git a/test-requirements.txt b/test-requirements.txt index cd3ebfd29e..dd1d531f67 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -23,3 +23,5 @@ tempest>=17.1.0 # Apache-2.0 # Functional tests. requests>=2.14.2 # Apache-2.0 + +bandit>=1.1.0 # Apache-2.0 diff --git a/tox.ini b/tox.ini index ae55ae3a6b..d10510ab2f 100644 --- a/tox.ini +++ b/tox.ini @@ -13,7 +13,7 @@ setenv = deps = -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -r{toxinidir}/test-requirements.txt - .[ldap,memcache,mongodb] + .[ldap,memcache] commands = stestr run {posargs} allowlist_externals = @@ -22,7 +22,6 @@ passenv = http_proxy,HTTP_PROXY,https_proxy,HTTPS_PROXY,no_proxy,NO_PROXY,PBR_VE [testenv:pep8] deps = - .[bandit] {[testenv]deps} commands = flake8 @@ -46,7 +45,6 @@ allowlist_externals = {toxinidir}/tools/fast8.sh deps = -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -r{toxinidir}/requirements.txt - .[bandit] commands = bandit -r keystone -x 'keystone/tests/*' [testenv:cover] @@ -112,7 +110,7 @@ per-file-ignores = deps = -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -r{toxinidir}/doc/requirements.txt - .[ldap,memcache,mongodb] + .[ldap,memcache] commands= bash -c "rm -rf doc/build" bash -c "rm -rf doc/source/api"