diff --git a/doc/source/conf.py b/doc/source/conf.py index ed472ad7..a43d96cf 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -64,11 +64,6 @@ role_name = 'os_neutron' target_name = 'openstack-ansible-' + role_name title = 'OpenStack-Ansible Documentation: ' + role_name + ' role' -# The link to the browsable source code (for the left hand menu) -oslosphinx_cgit_link = ( - 'https://opendev.org/openstack/{}'.format(target_name) -) - # openstackdocstheme options repository_name = 'openstack/' + target_name bug_project = "openstack-ansible" diff --git a/setup.cfg b/setup.cfg index e250796f..c02f9817 100644 --- a/setup.cfg +++ b/setup.cfg @@ -11,14 +11,3 @@ classifier = Intended Audience :: System Administrators License :: OSI Approved :: Apache Software License Operating System :: POSIX :: Linux - -[build_sphinx] -all_files = 1 -build-dir = doc/build -source-dir = doc/source - -[pbr] -warnerrors = True - -[wheel] -universal = 1 diff --git a/setup.py b/setup.py index 566d8443..cd35c3c3 100644 --- a/setup.py +++ b/setup.py @@ -13,17 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT import setuptools -# In python < 2.7.4, a lazy loading of package `pbr` will break -# setuptools if some other modules registered functions in `atexit`. -# solution from: http://bugs.python.org/issue15881#msg170215 -try: - import multiprocessing # noqa -except ImportError: - pass - setuptools.setup( setup_requires=['pbr>=2.0.0'], pbr=True)