From 727d1656dfbc9c61eba1c448303eedefb40592a6 Mon Sep 17 00:00:00 2001
From: Sorin Sbarnea <ssbarnea@redhat.com>
Date: Tue, 16 Mar 2021 13:41:20 +0000
Subject: [PATCH] Add support for py39

- Use version agnostic "py" inside tox default envs
- Enable py39 testing jobs (new template contains them)
- Address deprecation warning in setup.cfg regarding use of dashes
  instead of underlines (avoid future breakage with setuptools)

Change-Id: I26be50e029393e01db6718a21ac67d669ccd2e0c
---
 setup.cfg          | 4 ++--
 tox.ini            | 2 +-
 zuul.d/layout.yaml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 290cbfd9c7..3b5002108c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,12 +1,12 @@
 [metadata]
 name = tripleo-heat-templates
 summary = Heat templates for deploying OpenStack with OpenStack.
-description-file =
+description_file =
     README.rst
 author = OpenStack
 author_email = openstack-discuss@lists.openstack.org
 license = Apache License (2.0)
-home-page = https://opendev.org/openstack/tripleo-heat-templates
+home_page = https://opendev.org/openstack/tripleo-heat-templates
 classifier =
     Environment :: OpenStack
     Development Status :: 3 - Alpha
diff --git a/tox.ini b/tox.ini
index 532c98c7a1..d53d0019c2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 minversion = 2.0
 skipsdist = True
-envlist = pep8,py37,tht
+envlist = pep8,py,tht
 
 [testenv]
 basepython = python3
diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index 4e13125de0..8a9446b8cc 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -5,7 +5,7 @@
       - check-requirements
       - release-notes-jobs-python3
       - tripleo-standalone-scenarios-pipeline
-      - openstack-python3-victoria-jobs
+      - openstack-python3-wallaby-jobs
       - tripleo-standalone-multinode-ipa-pipeline
       - tripleo-upgrades-master-pipeline
     check: