From 260ee5ead1d8af475f3f9610c2861e471cd43724 Mon Sep 17 00:00:00 2001 From: Martin Kopec Date: Fri, 1 Apr 2022 10:53:34 +0200 Subject: [PATCH] Update jobs for Zed and disable auto discovery The patch adds a yoga job as the upstream has just released it and moved to the Zed development cycle. The patch also disables autodiscovery to avoid the following bug with setuptools 61.0.0 and possbile higher versions: https://github.com/pypa/setuptools/issues/3197 Change-Id: I0f274a5a6746aa97614b08b4bb75f4731923a5ed --- .zuul.yaml | 9 +++++++++ setup.py | 3 +++ 2 files changed, 12 insertions(+) diff --git a/.zuul.yaml b/.zuul.yaml index fe140ad..ce53a1f 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -4,6 +4,7 @@ jobs: - openstack-tox-linters - refstack-client-devstack-master + - refstack-client-devstack-yoga - refstack-client-devstack-xena - refstack-client-devstack-wallaby - refstack-client-devstack-victoria @@ -13,6 +14,7 @@ jobs: - openstack-tox-linters - refstack-client-devstack-master + - refstack-client-devstack-yoga - refstack-client-devstack-xena - refstack-client-devstack-wallaby - refstack-client-devstack-victoria @@ -82,6 +84,13 @@ irrelevant-files: - ^.*\.md$ +- job: + name: refstack-client-devstack-yoga + parent: refstack-client-devstack-master + override-checkout: stable/yoga + vars: + branch: stable/yoga + - job: name: refstack-client-devstack-xena parent: refstack-client-devstack-master diff --git a/setup.py b/setup.py index 6a931a6..b5275c8 100644 --- a/setup.py +++ b/setup.py @@ -16,4 +16,7 @@ import setuptools setuptools.setup( setup_requires=['pbr'], + # disable auto discovery to work around the following bug + # https://github.com/pypa/setuptools/issues/3197 + py_modules=[], pbr=True)