Increase the upper limit version of flake8 to fix install

This commit is contained in:
han-guangyu 2023-05-12 05:29:20 +00:00
parent 9b7d729e12
commit cfb07c573d
2 changed files with 39 additions and 9 deletions

View File

@ -0,0 +1,22 @@
From 822b191a137dccfd81963a9003c45ecbf67475f8 Mon Sep 17 00:00:00 2001
From: han-guangyu <hanguangyu@uniontech.com>
Date: Fri, 12 May 2023 05:23:23 +0000
Subject: [PATCH] Increase the upper limit version of flake8 to 6.0.0
---
requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.txt b/requirements.txt
index 9b18c80..fa0d5f8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,4 +7,4 @@ pbr!=2.1.0,>=2.0.0 # Apache-2.0
PyYAML>=3.12 # MIT
stevedore>=1.20.0 # Apache-2.0
# NOTE(ianw) in here because dib-lint uses flake8
-flake8<4.0.0,>=3.6.0 # MIT
+flake8<=6.0.0,>=3.6.0 # MIT
--
2.33.0

View File

@ -1,11 +1,16 @@
%global _empty_manifest_terminate_build 0 %global _empty_manifest_terminate_build 0
Name: diskimage-builder Name: diskimage-builder
Version: 3.20.3 Version: 3.20.3
Release: 1 Release: 2
Summary: Golden Disk Image builder. Summary: olden Disk Image builder.
License: Apache-2.0 License: Apache-2.0
URL: https://docs.openstack.org/diskimage-builder URL: https://docs.openstack.org/diskimage-builder
Source0: https://files.pythonhosted.org/packages/d6/44/fd52369109e56e0219a7607ccd4f2e0cc7c4caf730956cc27f62533babe8/diskimage-builder-3.20.3.tar.gz Source0: https://files.pythonhosted.org/packages/d6/44/fd52369109e56e0219a7607ccd4f2e0cc7c4caf730956cc27f62533babe8/diskimage-builder-3.20.3.tar.gz
# Increase upper version to fix install because python-flake8 has been
# upgraded to 6.0.0
Patch0: 0001-Increase-the-upper-limit-version-of-flake8-to-6.0.0.patch
BuildArch: noarch BuildArch: noarch
BuildRequires: python3-devel BuildRequires: python3-devel
@ -41,7 +46,7 @@ use with OpenStack.
%define __requires_exclude /sbin/runscript %define __requires_exclude /sbin/runscript
%prep %prep
%autosetup -n diskimage-builder-%{version} %autosetup -n diskimage-builder-%{version} -p1
%build %build
%py3_build %py3_build
@ -81,6 +86,9 @@ mv %{buildroot}/doclist.lst .
%{_docdir}/* %{_docdir}/*
%changelog %changelog
* Fri May 12 2023 Han Guangyu <hanguangyu@uniontech.com> - 3.20.3-2
- Increase the upper limit version of flake8 to fix install
* Mon Jul 04 2022 OpenStack_SIG <openstack@openeuler.org> - 3.20.3-1 * Mon Jul 04 2022 OpenStack_SIG <openstack@openeuler.org> - 3.20.3-1
- Upgrade package python3-diskimage-builder to version 3.20.3 - Upgrade package python3-diskimage-builder to version 3.20.3