From 77b69a37ce5eac392a55be39be5aa47c4fd48861 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Tue, 14 Nov 2023 22:47:42 +0900
Subject: [PATCH] Remove oslo namespace package (again)

The oslo namespace package was removed once[1] but was readded[2]
because of some problems at the time because nova required the old
namespace until liberty release.

Time has passed and now we should be ready to re-remove it.

[1] 18d7b08490df85dd30dccd7632ee83126cdf8106
[2] ce6ca042806dc09b33d30c56dac88e01d2ea24ec

Change-Id: If2163eb1229448dd4bf765978b6f4cc5cbdd0a25
---
 oslo/__init__.py                              | 13 -----
 oslo/middleware/__init__.py                   | 52 -------------------
 ...emove-oslo-namespace-b0f050f074d12aff.yaml |  5 ++
 3 files changed, 5 insertions(+), 65 deletions(-)
 delete mode 100644 oslo/__init__.py
 delete mode 100644 oslo/middleware/__init__.py
 create mode 100644 releasenotes/notes/remove-oslo-namespace-b0f050f074d12aff.yaml

diff --git a/oslo/__init__.py b/oslo/__init__.py
deleted file mode 100644
index dc130d6..0000000
--- a/oslo/__init__.py
+++ /dev/null
@@ -1,13 +0,0 @@
-#    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
deleted file mode 100644
index 844bf9d..0000000
--- a/oslo/middleware/__init__.py
+++ /dev/null
@@ -1,52 +0,0 @@
-#    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/releasenotes/notes/remove-oslo-namespace-b0f050f074d12aff.yaml b/releasenotes/notes/remove-oslo-namespace-b0f050f074d12aff.yaml
new file mode 100644
index 0000000..c9d666d
--- /dev/null
+++ b/releasenotes/notes/remove-oslo-namespace-b0f050f074d12aff.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    The ``olso.middleware`` package has been removed. This package was earlier
+    deprecated to be replaced by the ``oslo_middleware`` package.