From f96e7fede351468fb6c6c80244421ae763c1a697 Mon Sep 17 00:00:00 2001 From: Sean McGinnis Date: Sun, 21 Sep 2025 03:12:24 -0500 Subject: [PATCH] Various updates to pass CI This cleans up and updates the project configuration to get it up to current requirements and able to pass CI. Raises some requirements versions and job settings. Most notable is probably switching from the "*-no-constraints" Python jobs that are not really maintained to the common py3 template. This will run unit tests with additional py3 versions to cover current OpenStack required versions, as well as using the global upper constraints. This way the project will track what is being done with other OpenStack projects. Change-Id: I390e2a55f475f33a03d393c53a6f79af7a80eaf3 Signed-off-by: Sean McGinnis --- .zuul.yaml | 2 +- requirements.txt | 2 +- reviewstats/utils.py | 7 ++++--- setup.py | 2 +- test-requirements.txt | 9 ++++----- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index e2d2410..32a7ecf 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,5 +1,5 @@ - project: templates: - openstack-pep-publish-jobs - - openstack-python38-jobs-no-constraints + - openstack-python3-jobs - publish-openstack-docs-pti diff --git a/requirements.txt b/requirements.txt index 0342d90..051dcb1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ paramiko pbr>=2.0,!=2.1.0 prettytable -pytz>=2010h +pytz>=2025.2 requests>=2.2.0,!=2.4.0 PyYAML>=3.1.0 launchpadlib diff --git a/reviewstats/utils.py b/reviewstats/utils.py index c130d18..f1fabdc 100644 --- a/reviewstats/utils.py +++ b/reviewstats/utils.py @@ -123,9 +123,10 @@ def get_projects_info(project=None, all_projects=False, if name == project_name: for d, d_data in data['deliverables'].items(): projects[-1]['subprojects'] += d_data['repos'] - projects[-1]['subprojects'] = sorted( - list(set(projects[-1]['subprojects'])) - ) + if len(projects) > 0: + projects[-1]['subprojects'] = sorted( + list(set(projects[-1]['subprojects'])) + ) return projects diff --git a/setup.py b/setup.py index 2a0786a..e471756 100755 --- a/setup.py +++ b/setup.py @@ -18,5 +18,5 @@ import setuptools setuptools.setup( - setup_requires=['pbr>=0.5.21,<1.0'], + setup_requires=['pbr>=6.1.1'], pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index 27dc429..c85b382 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,6 +1,5 @@ -hacking>=3.1.0,<=3.2.0 # Apache-2.0 +hacking>=7.0.0,<7.1.0 # Apache-2.0 -coverage>=3.6 -fixtures>=0.3.14 -python-subunit -stestr>=2.0.0 +stestr>=3.2.1 # Apache-2.0 +coverage>=5.5 # Apache-2.0 +fixtures>=3.0.0 # Apache-2.0/BSD