openstack/python-cinderclient
Code Issues Proposed changes

Merge "remove simplejson requirement"

Browse Source
This commit is contained in:
Zuul 2023-02-10 20:11:04 +00:00 committed by Gerrit Code Review
commit c8eb9bd0a9
2 changed files with 1 additions and 6 deletions

6
cinderclient/client.py

@ -20,6 +20,7 @@ import glob
import hashlib import hashlib
import importlib.util import importlib.util
import itertools import itertools
import json
import logging import logging
import os import os
import pkgutil import pkgutil
@ -46,11 +47,6 @@ try:
except ImportError: except ImportError:
from time import sleep from time import sleep
try:
import json
except ImportError:
import simplejson as json
try: try:
osprofiler_web = importutils.try_import("osprofiler.web") osprofiler_web = importutils.try_import("osprofiler.web")
except Exception: except Exception:

1
requirements.txt

@ -4,7 +4,6 @@
pbr>=5.5.0 # Apache-2.0 pbr>=5.5.0 # Apache-2.0
PrettyTable>=0.7.2 # BSD PrettyTable>=0.7.2 # BSD
keystoneauth1>=4.3.1 # Apache-2.0 keystoneauth1>=4.3.1 # Apache-2.0
simplejson>=3.5.1 # MIT
oslo.i18n>=5.0.1 # Apache-2.0 oslo.i18n>=5.0.1 # Apache-2.0
oslo.utils>=4.8.0 # Apache-2.0 oslo.utils>=4.8.0 # Apache-2.0
requests>=2.25.1 # Apache-2.0 requests>=2.25.1 # Apache-2.0