diff options
-rw-r--r-- | oslo/__init__.py | 13 | ||||
-rw-r--r-- | oslo/middleware/__init__.py | 52 | ||||
-rw-r--r-- | requirements.txt | 2 | ||||
-rw-r--r-- | setup.cfg | 4 |
4 files changed, 70 insertions, 1 deletions
diff --git a/oslo/__init__.py b/oslo/__init__.py new file mode 100644 index 0000000..dc130d6 --- /dev/null +++ b/oslo/__init__.py @@ -0,0 +1,13 @@ +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +__import__('pkg_resources').declare_namespace(__name__) diff --git a/oslo/middleware/__init__.py b/oslo/middleware/__init__.py new file mode 100644 index 0000000..844bf9d --- /dev/null +++ b/oslo/middleware/__init__.py @@ -0,0 +1,52 @@ +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +import sys +import warnings + +def deprecated(): + new_name = __name__.replace('.', '_') + warnings.warn( + ('The oslo namespace package is deprecated. Please use %s instead.' % + new_name), + DeprecationWarning, + stacklevel=3, + ) + + +# NOTE(dims): We cannot remove the deprecation or redirects below +# until Liberty-EOL +deprecated() + +from oslo_middleware import base +from oslo_middleware import catch_errors +from oslo_middleware import correlation_id +from oslo_middleware import debug +from oslo_middleware import request_id +from oslo_middleware import sizelimit + +sys.modules['oslo.middleware.base'] = base +sys.modules['oslo.middleware.catch_errors'] = catch_errors +sys.modules['oslo.middleware.correlation_id'] = correlation_id +sys.modules['oslo.middleware.debug'] = debug +sys.modules['oslo.middleware.request_id'] = request_id +sys.modules['oslo.middleware.sizelimit'] = sizelimit + +from oslo_middleware.catch_errors import CatchErrors +from oslo_middleware.correlation_id import CorrelationId +from oslo_middleware.cors import CORS +from oslo_middleware.debug import Debug +from oslo_middleware.healthcheck import Healthcheck +from oslo_middleware.http_proxy_to_wsgi import HTTPProxyToWSGI +from oslo_middleware.request_id import RequestId +from oslo_middleware.sizelimit import RequestBodySizeLimiter +from oslo_middleware.ssl import SSLMiddleware
\ No newline at end of file diff --git a/requirements.txt b/requirements.txt index df4e05c..26576a3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,7 +9,7 @@ ordereddict oslo.config>=2.7.0 # Apache-2.0 oslo.context>=0.2.0 # Apache-2.0 oslo.i18n>=1.5.0 # Apache-2.0 -oslo.utils>=2.8.0 # Apache-2.0 +oslo.utils!=3.1.0,>=2.8.0 # Apache-2.0 six>=1.9.0 stevedore>=1.5.0 # Apache-2.0 WebOb>=1.2.3 @@ -20,7 +20,11 @@ classifier = [files] packages = + oslo + oslo.middleware oslo_middleware +namespace_packages = + oslo [entry_points] oslo.config.opts = |