From 8480440cdbbff48031d7233220a31ee985e4abe7 Mon Sep 17 00:00:00 2001 From: Ronald Bradford Date: Mon, 11 Jul 2016 15:33:22 -0400 Subject: [PATCH] Remove docs,comments,references to Oslo Incubator Oslo Incubator is no longer used in this project and is not longer supported by the Oslo project. Change-Id: I97be93894b02f47f5cdd1dcc237b537ff8e2bbdb --- .../api/zaqar.openstack.common.cache._backends.memory.rst | 7 ------- doc/source/api/zaqar.openstack.common.cache.backends.rst | 7 ------- doc/source/api/zaqar.openstack.common.cache.cache.rst | 7 ------- doc/source/api/zaqar.openstack.common.excutils.rst | 7 ------- doc/source/api/zaqar.openstack.common.fileutils.rst | 7 ------- doc/source/api/zaqar.openstack.common.gettextutils.rst | 7 ------- doc/source/api/zaqar.openstack.common.lockutils.rst | 7 ------- doc/source/api/zaqar.openstack.common.timeutils.rst | 7 ------- tox.ini | 4 ++-- zaqar/cmd/gc.py | 4 +--- zaqar/cmd/server.py | 4 +--- zaqar/transport/wsgi/app.py | 4 +--- 12 files changed, 5 insertions(+), 67 deletions(-) delete mode 100644 doc/source/api/zaqar.openstack.common.cache._backends.memory.rst delete mode 100644 doc/source/api/zaqar.openstack.common.cache.backends.rst delete mode 100644 doc/source/api/zaqar.openstack.common.cache.cache.rst delete mode 100644 doc/source/api/zaqar.openstack.common.excutils.rst delete mode 100644 doc/source/api/zaqar.openstack.common.fileutils.rst delete mode 100644 doc/source/api/zaqar.openstack.common.gettextutils.rst delete mode 100644 doc/source/api/zaqar.openstack.common.lockutils.rst delete mode 100644 doc/source/api/zaqar.openstack.common.timeutils.rst diff --git a/doc/source/api/zaqar.openstack.common.cache._backends.memory.rst b/doc/source/api/zaqar.openstack.common.cache._backends.memory.rst deleted file mode 100644 index e5eb47dfe..000000000 --- a/doc/source/api/zaqar.openstack.common.cache._backends.memory.rst +++ /dev/null @@ -1,7 +0,0 @@ -The :mod:`zaqar.openstack.common.cache._backends.memory` module -================================================================ - -.. automodule:: zaqar.openstack.common.cache._backends.memory - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/source/api/zaqar.openstack.common.cache.backends.rst b/doc/source/api/zaqar.openstack.common.cache.backends.rst deleted file mode 100644 index 7ed517808..000000000 --- a/doc/source/api/zaqar.openstack.common.cache.backends.rst +++ /dev/null @@ -1,7 +0,0 @@ -The :mod:`zaqar.openstack.common.cache.backends` module -======================================================== - -.. automodule:: zaqar.openstack.common.cache.backends - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/source/api/zaqar.openstack.common.cache.cache.rst b/doc/source/api/zaqar.openstack.common.cache.cache.rst deleted file mode 100644 index 6a659d182..000000000 --- a/doc/source/api/zaqar.openstack.common.cache.cache.rst +++ /dev/null @@ -1,7 +0,0 @@ -The :mod:`zaqar.openstack.common.cache.cache` module -===================================================== - -.. automodule:: zaqar.openstack.common.cache.cache - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/source/api/zaqar.openstack.common.excutils.rst b/doc/source/api/zaqar.openstack.common.excutils.rst deleted file mode 100644 index c3f2fc29d..000000000 --- a/doc/source/api/zaqar.openstack.common.excutils.rst +++ /dev/null @@ -1,7 +0,0 @@ -The :mod:`zaqar.openstack.common.excutils` module -================================================== - -.. automodule:: zaqar.openstack.common.excutils - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/source/api/zaqar.openstack.common.fileutils.rst b/doc/source/api/zaqar.openstack.common.fileutils.rst deleted file mode 100644 index 55837db4d..000000000 --- a/doc/source/api/zaqar.openstack.common.fileutils.rst +++ /dev/null @@ -1,7 +0,0 @@ -The :mod:`zaqar.openstack.common.fileutils` module -=================================================== - -.. automodule:: zaqar.openstack.common.fileutils - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/source/api/zaqar.openstack.common.gettextutils.rst b/doc/source/api/zaqar.openstack.common.gettextutils.rst deleted file mode 100644 index efdc50b2b..000000000 --- a/doc/source/api/zaqar.openstack.common.gettextutils.rst +++ /dev/null @@ -1,7 +0,0 @@ -The :mod:`zaqar.openstack.common.gettextutils` module -====================================================== - -.. automodule:: zaqar.openstack.common.gettextutils - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/source/api/zaqar.openstack.common.lockutils.rst b/doc/source/api/zaqar.openstack.common.lockutils.rst deleted file mode 100644 index 6ad4f9d30..000000000 --- a/doc/source/api/zaqar.openstack.common.lockutils.rst +++ /dev/null @@ -1,7 +0,0 @@ -The :mod:`zaqar.openstack.common.lockutils` module -=================================================== - -.. automodule:: zaqar.openstack.common.lockutils - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/source/api/zaqar.openstack.common.timeutils.rst b/doc/source/api/zaqar.openstack.common.timeutils.rst deleted file mode 100644 index 46db714c7..000000000 --- a/doc/source/api/zaqar.openstack.common.timeutils.rst +++ /dev/null @@ -1,7 +0,0 @@ -The :mod:`zaqar.openstack.common.timeutils` module -=================================================== - -.. automodule:: zaqar.openstack.common.timeutils - :members: - :undoc-members: - :show-inheritance: diff --git a/tox.ini b/tox.ini index d5ea72226..b6d872916 100644 --- a/tox.ini +++ b/tox.ini @@ -79,11 +79,11 @@ exclude = .venv*,.git,.tox,dist,doc,*lib/python*,*.egg,.update-venv max-complexity = 16 [hacking] -import_exceptions = zaqar.openstack.common.gettextutils._,zaqar.i18n._ +import_exceptions = zaqar.i18n._ [testenv:install-guide] # NOTE(jaegerandi): this target does not use constraints because # upstream infra does not yet support it. Once that's fixed, we can # drop the install_command. install_command = pip install -U --force-reinstall {opts} {packages} -commands = sphinx-build -a -E -W -d install-guide/build/doctrees -b html install-guide/source install-guide/build/html \ No newline at end of file +commands = sphinx-build -a -E -W -d install-guide/build/doctrees -b html install-guide/source install-guide/build/html diff --git a/zaqar/cmd/gc.py b/zaqar/cmd/gc.py index bcb396234..767fd1a11 100644 --- a/zaqar/cmd/gc.py +++ b/zaqar/cmd/gc.py @@ -25,9 +25,7 @@ LOG = log.getLogger(__name__) # tool is advised. @cli.runnable def run(): - # TODO(kgriffs): For now, we have to use the global config - # to pick up common options from openstack.common.log, since - # that module uses the global CONF instance exclusively. + # Use the global CONF instance conf = cfg.CONF conf(project='zaqar', prog='zaqar-gc') diff --git a/zaqar/cmd/server.py b/zaqar/cmd/server.py index 4c3782f32..24de42b4d 100644 --- a/zaqar/cmd/server.py +++ b/zaqar/cmd/server.py @@ -31,9 +31,7 @@ _CLI_OPTIONS = ( @cli.runnable def run(): - # TODO(kgriffs): For now, we have to use the global config - # to pick up common options from openstack.common.log, since - # that module uses the global CONF instance exclusively. + # Use the global CONF instance conf = cfg.CONF # NOTE(eggmaster): register command line options for zaqar-server conf.register_cli_opts(_CLI_OPTIONS) diff --git a/zaqar/transport/wsgi/app.py b/zaqar/transport/wsgi/app.py index 91feb7de9..6cd41864b 100644 --- a/zaqar/transport/wsgi/app.py +++ b/zaqar/transport/wsgi/app.py @@ -30,9 +30,7 @@ from oslo_config import cfg from zaqar import bootstrap -# TODO(kgriffs): For now, we have to use the global config -# to pick up common options from openstack.common.log, since -# that module uses the global CONF instance exclusively. +# Use the global CONF instance conf = cfg.CONF conf(project='zaqar', prog='zaqar-queues', args=[])