From 17835cb3dff310a874c486f95846174e4aeb2f30 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 13 Nov 2023 22:27:06 +0900 Subject: [PATCH] List up extra requirements for drivers Most of the drivers require extra requirements. This adds these to the extras field in setup.cfg so that users can more easily install extra requirements. Also removes the lower-constraints.txt file because we already removed tests of l-c by [1]. Note that the lower versions of SQLAlchemy and oslo.messaging are picked up from requirements in the other repos, and further lower versions might be allowed. [1] bcca5bd4a8c3fed96dfcf01bf24233fa509e610b Change-Id: If4492943199c75c294e4eb5a3600cf5d2bdad0b8 --- lower-constraints.txt | 24 ------------------------ setup.cfg | 17 +++++++++++++++++ test-requirements.txt | 4 ++-- 3 files changed, 19 insertions(+), 26 deletions(-) delete mode 100644 lower-constraints.txt diff --git a/lower-constraints.txt b/lower-constraints.txt deleted file mode 100644 index 91c4dcd..0000000 --- a/lower-constraints.txt +++ /dev/null @@ -1,24 +0,0 @@ -coverage===4.0 -ddt===1.0.1 -docutils==0.14 -dulwich===0.15.0 -elasticsearch===2.0.0 -importlib_metadata==1.7.0 -jaeger-client==3.8.0 -opentelemetry-exporter-otlp==1.16.0 -opentelemetry-sdk==1.16.0 -netaddr===0.7.18 -openstackdocstheme==2.2.1 -oslo.concurrency===3.26.0 -oslo.config===5.2.0 -oslo.serialization===2.18.0 -oslo.utils===3.33.0 -PrettyTable===0.7.2 -pymongo===3.0.2 -redis===2.10.0 -reno==3.1.0 -requests===2.14.2 -Sphinx===2.0.0 -stestr==2.0.0 -testtools===2.2.0 -WebOb===1.7.1 diff --git a/setup.cfg b/setup.cfg index 477a86f..ed721e4 100644 --- a/setup.cfg +++ b/setup.cfg @@ -24,6 +24,23 @@ classifier = packages = osprofiler +[extras] +elasticsearch = + elasticsearch>=2.0.0,<3.0.0 # Apache-2.0 +jaeger = + jaeger-client>=3.8.0 # Apache-2.0 +messaging = + oslo.messaging>=14.1.0 # Apache-2.0 +mongo = + pymongo!=3.1,>=3.0.2 # Apache-2.0 +otlp = + opentelemetry-exporter-otlp>=1.16.0 #Apache-2.0 + opentelemetry-sdk>=1.16.0 # Apache-2.0 +redis = + redis>=2.10.0 # MIT +sqlalchemy = + SQLAlchemy>=1.4.0 # MIT + [entry_points] oslo.config.opts = osprofiler = osprofiler.opts:list_opts diff --git a/test-requirements.txt b/test-requirements.txt index 096429d..bd85faa 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -20,7 +20,7 @@ redis>=2.10.0 # MIT # For Jaeger Tracing jaeger-client>=3.8.0 # Apache-2.0 -opentelemetry-exporter-otlp>=1.16.0 -opentelemetry-sdk>=1.16.0 +opentelemetry-exporter-otlp>=1.16.0 # Apache-2.0 +opentelemetry-sdk>=1.16.0 # Apache-2.0 pre-commit>=2.6.0 # MIT