From 6df4f46055c64e877ce555123b5be7ab395429cc Mon Sep 17 00:00:00 2001
From: "Dr. Jens Harbott" <harbott@osism.tech>
Date: Fri, 29 Apr 2022 13:55:59 +0200
Subject: [PATCH] Disable auto-discovery for setuptools and update python
 testing

With setuptools release 61.0.0 docs build started to fail:
error: Multiple top-level packages discovered in a flat-layout:
['specs', 'attic', 'superseded'].

This bug is mentioned in setuptools issue 3197 [0], and the suggested
workaround is to disable auto-discovery by adding 'py_modules=[]' in
setup.py.

Also use recent python versions because the old ones are no longer available.

These 2 unrelated changes need to be merged together in order to unblock
the gate.

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

Change-Id: Iddc30b9521b61d9083c2b1f6e8a6707196ea0a57
---
 .zuul.yaml | 2 +-
 setup.py   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 6ba814cb..3cd0a1b2 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,4 +1,4 @@
 - project:
     templates:
       - openstack-specs-jobs
-      - openstack-python3-ussuri-jobs
+      - openstack-python3-zed-jobs
diff --git a/setup.py b/setup.py
index c0a24eab..5f711594 100644
--- a/setup.py
+++ b/setup.py
@@ -18,4 +18,5 @@ import setuptools
 
 setuptools.setup(
     setup_requires=['pbr'],
-    pbr=True)
+    pbr=True,
+    py_modules=[])