!15 update to upstream version 3.31.0

From: @desert-sailor 
Reviewed-by: @han-guangyu 
Signed-off-by: @han-guangyu

0001-Increase-the-upper-limit-version-of-flake8-to-6.0.0.patch

@@ -1,22 +0,0 @@
-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
-

0001-Increase-the-upper-limit-version-of-flake8.patch

@@ -0,0 +1,23 @@
+From b727fc3b0c299caf697688964b9e24acf53f7f2c Mon Sep 17 00:00:00 2001
+From: desert-sailor <dxwangk@isoftstone.com>
+Date: Fri, 8 Sep 2023 10:17:17 +0800
+Subject: [PATCH] Increase the upper limit version of flake8 to 7.0.0
+
+---
+ requirements.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/requirements.txt b/requirements.txt
+index 067d95f..0aefaff 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -7,5 +7,5 @@ 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<6.0.0,>=3.6.0 # MIT
++flake8<7.0.0,>=3.6.0 # MIT
+ jsonschema>=3.0.2 # MIT
+-- 
+2.33.0
+

diskimage-builder.spec

@@ -1,15 +1,15 @@
 %global _empty_manifest_terminate_build 0
 Name:       diskimage-builder
-Version:    3.20.3
+Version:    3.31.0
-Release:    2
+Release:    1
 Summary:    olden Disk Image builder.
 License:    Apache-2.0
 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/6c/1f/ba8b6fdae713d83f4e2eed27db36eccf9073d2d4cfc88bad800ad0b6093d/diskimage-builder-3.31.0.tar.gz
 
 # Increase upper version to fix install because python-flake8 has been
-# upgraded to 6.0.0
+# upgraded to 6.1.0
-Patch0:     0001-Increase-the-upper-limit-version-of-flake8-to-6.0.0.patch
+Patch0:     0001-Increase-the-upper-limit-version-of-flake8.patch
 
 BuildArch:  noarch
 
@@ -86,6 +86,9 @@ mv %{buildroot}/doclist.lst .
 %{_docdir}/*
 
 %changelog
+* Fri Sep 08 2023 Dongxing Wang <dxwangk@isoftstone.com> - 3.31.0-1
+- Upgrade package python3-diskimage-builder to version 3.31.0
+
 * Fri May 12 2023 Han Guangyu <hanguangyu@uniontech.com> - 3.20.3-2
 - Increase the upper limit version of flake8 to fix install