From d197c25f0cf18b4dce602a9dffa927fc7767d5ba Mon Sep 17 00:00:00 2001 From: Sean McGinnis Date: Wed, 4 Dec 2019 16:11:20 -0600 Subject: [PATCH] Switch to ussuri job templates We don't really need to follow the project-wide cycle templates, but most of the jobs defined in them are what we probably want to run anyway. This drops the py2 job template, since all of our code is only ever run under py3 now anyway, and switches from the train template to the ussuri template. Also drops py2 metadata tags since we don't expect (or want) to support that anymore. Change-Id: Ic55fa1f88141e7f592317fe334643bd7d81b5fd9 Signed-off-by: Sean McGinnis --- .zuul.d/project.yaml | 3 +-- setup.cfg | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.zuul.d/project.yaml b/.zuul.d/project.yaml index 38ac196582..73833f7623 100644 --- a/.zuul.d/project.yaml +++ b/.zuul.d/project.yaml @@ -1,8 +1,7 @@ - project: templates: - openstack-pypy-jobs-nonvoting - - openstack-python-jobs - - openstack-python3-train-jobs + - openstack-python3-ussuri-jobs check: jobs: - build-wheel-mirror-centos-7: diff --git a/setup.cfg b/setup.cfg index 31c5e35835..a931ab0841 100644 --- a/setup.cfg +++ b/setup.cfg @@ -15,8 +15,6 @@ classifier = Operating System :: Microsoft :: Windows Operating System :: MacOS :: MacOS X Programming Language :: Python - Programming Language :: Python :: 2 - Programming Language :: Python :: 2.7 Programming Language :: Python :: 3 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7