From 604cc59adaa0f2d42746fdbf18e9af5eea94efc4 Mon Sep 17 00:00:00 2001
From: melanie witt <melwittt@gmail.com>
Date: Tue, 29 Mar 2022 20:00:19 +0000
Subject: [PATCH] Remove setup.py and setup.cfg

Theses used to be used for building docs in the past and were made
obsolete with change Icc65afd5f6c0e22147b179c16d6a4fa5f47954ce.

A recent release of setuptools 61.0.0 introduced a breaking change [1]
which caused our openstack-tox-docs and openstack-tox-pep8 jobs to fail
with:

  error: Multiple top-level packages discovered in a flat-layout:
    ['specs', 'priorities'].

This removes setup.py and setup.cfg from use in tox.ini to resolve the
issue and they are not needed anyway.

Related-Bug: #1966382

[1] https://github.com/pypa/setuptools/issues/3197

Change-Id: Ib90065a62bdef235e83173c73894c478af0df5fa
---
 setup.cfg | 12 ------------
 setup.py  | 20 --------------------
 tox.ini   |  2 +-
 3 files changed, 1 insertion(+), 33 deletions(-)
 delete mode 100644 setup.cfg
 delete mode 100644 setup.py

diff --git a/setup.cfg b/setup.cfg
deleted file mode 100644
index 91f9cc91f..000000000
--- a/setup.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-[metadata]
-name = nova-specs
-summary = OpenStack Nova Project Development Specs
-description_file =
-    README.rst
-author = OpenStack
-author_email = openstack-discuss@lists.openstack.org
-home_page = http://specs.openstack.org/openstack/nova-specs/
-classifier =
-    Intended Audience :: Developers
-    License :: OSI Approved :: Apache Software License
-    Operating System :: POSIX :: Linux
diff --git a/setup.py b/setup.py
deleted file mode 100644
index eb4bd4303..000000000
--- a/setup.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
-#
-# 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 setuptools
-
-setuptools.setup(
-    setup_requires=['pbr>=2.0'],
-    pbr=True)
diff --git a/tox.ini b/tox.ini
index 5357ccf7e..831c49b76 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,7 @@ skipsdist = True
 
 [testenv]
 basepython = python3
-usedevelop = True
+#usedevelop = True
 setenv = VIRTUAL_ENV={envdir}
 deps = -r{toxinidir}/doc/requirements.txt
 allowlist_externals =