From f853061fe4721c8290f67dac0932a2e65ef36ff4 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Wed, 4 Jan 2023 12:04:45 +0000 Subject: [PATCH] setup.py: Remove 'py_modules' This was merely obscuring a bug in pbr. setuptools doesn't do the auto-discovery when pbr is in use. Remove it. Also fixes the environments list where it is now validated for what is installed by removing functional-py38, and fixing the job to just be "functional". Signed-off-by: Stephen Finucane Depends-on: https://review.opendev.org/c/openstack/pbr/+/869082 Change-Id: Ife999840777f3c553f569d81cd826ef9d5a6765d --- setup.py | 4 ++-- tox.ini | 4 ++-- zuul.d/project.yaml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/setup.py b/setup.py index 31d6ada1..e5bafb01 100644 --- a/setup.py +++ b/setup.py @@ -17,5 +17,5 @@ setuptools.setup( setup_requires=['pbr>=2.0.0'], - py_modules=[], - pbr=True) + pbr=True, +) diff --git a/tox.ini b/tox.ini index 31834982..3c029e75 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] minversion = 3.18.0 -envlist = py3,pep8,functional-py38 +envlist = py3,pep8 ignore_basepython_conflict=true [testenv] @@ -60,7 +60,7 @@ commands = flake8 ironic_inspector doc8 -e .rst -e .inc README.rst CONTRIBUTING.rst doc/source api-ref/source -[testenv:functional-py38] +[testenv:functional] commands = python3 -m ironic_inspector.test.functional {posargs} diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 1b14ff62..a47868bd 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -14,7 +14,7 @@ #to fix right after - ironic-inspector-tempest-managed-non-standalone: voting: false - - openstack-tox-functional-py38 + - openstack-tox-functional - bifrost-integration-tinyipa-ubuntu-focal: voting: false - ironic-inspector-tox-bandit: @@ -24,4 +24,4 @@ - ironic-inspector-grenade - ironic-inspector-tempest - ironic-inspector-tempest-discovery - - openstack-tox-functional-py38 + - openstack-tox-functional