From 129c0c5f3f1fe969e0251b394f41a8a847ad503e Mon Sep 17 00:00:00 2001 From: Ghanshyam Mann Date: Sat, 4 Jul 2020 12:38:58 -0500 Subject: [PATCH] migrate tox based testing to ubuntu focal As per victoria cycle testing runtime and community goal[1] we need to migrate upstream CI/CD to Ubuntu Focal(20.04). Fixing: - bug#1886296 Bump the pyflakes to 2.1.1 as min version to run pep8 jobs on py3.8 which is default python vesion in ubuntu focal. Integratrion testing migration will be done later once https://storyboard.openstack.org/#!/story/2007732 is fixed Story: #2007865 Task: #40177 [1] https://governance.openstack.org/tc/goals/selected/victoria/migrate-ci-cd-jobs-to-ubuntu-focal.html Change-Id: Ic4fd981240f59da4106088c61baec801e031f2c3 --- barbican/plugin/dogtag.py | 2 +- test-requirements.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/barbican/plugin/dogtag.py b/barbican/plugin/dogtag.py index 8063e5fee..40f7dadf7 100644 --- a/barbican/plugin/dogtag.py +++ b/barbican/plugin/dogtag.py @@ -666,7 +666,7 @@ def _catch_subca_deletion_exceptions(ca_related_function): def _catch_subca_exception(self, *args, **kwargs): try: return ca_related_function(self, *args, **kwargs) - except pki.ResourceNotFoundException as e: + except pki.ResourceNotFoundException: LOG.warning("Sub-CA already deleted") pass except pki.PKIException as e: diff --git a/test-requirements.txt b/test-requirements.txt index 7d91896b8..4a70342e3 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,6 +4,7 @@ # hacking should appear first in case something else depends on pep8 hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 +pyflakes>=2.1.1 coverage!=4.4,>=4.0 # Apache-2.0 ddt>=1.0.1 # MIT