From 229e16bde97e7b3c7d9c0fd7a4a18c553ce94522 Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Thu, 6 Feb 2014 08:42:54 -0800 Subject: [PATCH] Rename package from oslo.sphinx to oslosphinx Having the sphinx theme in the same namespace package as the production code has been causing issues with devstack installations. This change renames the package to move it out of the namespace. Another change to the openstack-infra/config repository will rename the git repository and associated jobs. Partial-bug: #1277168 Change-Id: I7788a9d6b5984fdfcc4678f2182104d2eb8a2be0 --- oslo/__init__.py | 17 ----------------- {oslo/sphinx => oslosphinx}/__init__.py | 0 {oslo/sphinx => oslosphinx}/intersphinx.py | 0 .../theme/openstack/layout.html | 0 .../theme/openstack/static/basic.css | 0 .../theme/openstack/static/default.css | 0 .../theme/openstack/static/header-line.gif | Bin .../theme/openstack/static/header_bg.jpg | Bin .../theme/openstack/static/nature.css | 0 .../theme/openstack/static/openstack_logo.png | Bin .../theme/openstack/static/tweaks.css | 0 .../theme/openstack/theme.conf | 0 setup.cfg | 9 +++------ tox.ini | 2 +- 14 files changed, 4 insertions(+), 24 deletions(-) delete mode 100644 oslo/__init__.py rename {oslo/sphinx => oslosphinx}/__init__.py (100%) rename {oslo/sphinx => oslosphinx}/intersphinx.py (100%) rename {oslo/sphinx => oslosphinx}/theme/openstack/layout.html (100%) rename {oslo/sphinx => oslosphinx}/theme/openstack/static/basic.css (100%) rename {oslo/sphinx => oslosphinx}/theme/openstack/static/default.css (100%) rename {oslo/sphinx => oslosphinx}/theme/openstack/static/header-line.gif (100%) rename {oslo/sphinx => oslosphinx}/theme/openstack/static/header_bg.jpg (100%) rename {oslo/sphinx => oslosphinx}/theme/openstack/static/nature.css (100%) rename {oslo/sphinx => oslosphinx}/theme/openstack/static/openstack_logo.png (100%) rename {oslo/sphinx => oslosphinx}/theme/openstack/static/tweaks.css (100%) rename {oslo/sphinx => oslosphinx}/theme/openstack/theme.conf (100%) diff --git a/oslo/__init__.py b/oslo/__init__.py deleted file mode 100644 index f03502a..0000000 --- a/oslo/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - -# Copyright 2013 New Dream Network, LLC (DreamHost) -# -# 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/sphinx/__init__.py b/oslosphinx/__init__.py similarity index 100% rename from oslo/sphinx/__init__.py rename to oslosphinx/__init__.py diff --git a/oslo/sphinx/intersphinx.py b/oslosphinx/intersphinx.py similarity index 100% rename from oslo/sphinx/intersphinx.py rename to oslosphinx/intersphinx.py diff --git a/oslo/sphinx/theme/openstack/layout.html b/oslosphinx/theme/openstack/layout.html similarity index 100% rename from oslo/sphinx/theme/openstack/layout.html rename to oslosphinx/theme/openstack/layout.html diff --git a/oslo/sphinx/theme/openstack/static/basic.css b/oslosphinx/theme/openstack/static/basic.css similarity index 100% rename from oslo/sphinx/theme/openstack/static/basic.css rename to oslosphinx/theme/openstack/static/basic.css diff --git a/oslo/sphinx/theme/openstack/static/default.css b/oslosphinx/theme/openstack/static/default.css similarity index 100% rename from oslo/sphinx/theme/openstack/static/default.css rename to oslosphinx/theme/openstack/static/default.css diff --git a/oslo/sphinx/theme/openstack/static/header-line.gif b/oslosphinx/theme/openstack/static/header-line.gif similarity index 100% rename from oslo/sphinx/theme/openstack/static/header-line.gif rename to oslosphinx/theme/openstack/static/header-line.gif diff --git a/oslo/sphinx/theme/openstack/static/header_bg.jpg b/oslosphinx/theme/openstack/static/header_bg.jpg similarity index 100% rename from oslo/sphinx/theme/openstack/static/header_bg.jpg rename to oslosphinx/theme/openstack/static/header_bg.jpg diff --git a/oslo/sphinx/theme/openstack/static/nature.css b/oslosphinx/theme/openstack/static/nature.css similarity index 100% rename from oslo/sphinx/theme/openstack/static/nature.css rename to oslosphinx/theme/openstack/static/nature.css diff --git a/oslo/sphinx/theme/openstack/static/openstack_logo.png b/oslosphinx/theme/openstack/static/openstack_logo.png similarity index 100% rename from oslo/sphinx/theme/openstack/static/openstack_logo.png rename to oslosphinx/theme/openstack/static/openstack_logo.png diff --git a/oslo/sphinx/theme/openstack/static/tweaks.css b/oslosphinx/theme/openstack/static/tweaks.css similarity index 100% rename from oslo/sphinx/theme/openstack/static/tweaks.css rename to oslosphinx/theme/openstack/static/tweaks.css diff --git a/oslo/sphinx/theme/openstack/theme.conf b/oslosphinx/theme/openstack/theme.conf similarity index 100% rename from oslo/sphinx/theme/openstack/theme.conf rename to oslosphinx/theme/openstack/theme.conf diff --git a/setup.cfg b/setup.cfg index 50232fd..f90da7b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] -name = oslo.sphinx -summary = OpenStack Sphinx Extensions +name = oslosphinx +summary = OpenStack Sphinx Extensions and Theme description-file = README.rst author = OpenStack @@ -24,10 +24,7 @@ setup-hooks = [files] packages = - oslo - oslo.sphinx -namespace_packages = - oslo + oslosphinx [build_sphinx] all_files = 1 diff --git a/tox.ini b/tox.ini index 0c8d1c7..e7a71d7 100644 --- a/tox.ini +++ b/tox.ini @@ -14,7 +14,7 @@ downloadcache = {toxworkdir}/_download [testenv:pep8] commands = - flake8 oslo + flake8 oslosphinx [testenv:venv] commands = {posargs}