Merge pull request #23 from hiwakaba/master

Fixes the release build error
yahoojapan · May 9, 2023 · 977c3b4 · 977c3b4
2 parents 7bcdd7a + f1f1b2d
commit 977c3b4
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 44 deletions.
diff --git a/.github/workflows/python_helper.sh b/.github/workflows/python_helper.sh
@@ -552,7 +552,7 @@ fi
 if [ -n "${OPT_FORCE_PUBLISHER}" ]; then
 	CI_FORCE_PUBLISHER="${OPT_FORCE_PUBLISHER}"
 elif [ -n "${ENV_FORCE_PUBLISHER}" ]; then
-	if [ "${ENV_FORCE_PUBLISHER}" = "3.9" ] || [ "${ENV_FORCE_PUBLISHER}" = "3.10" ] || [ "${ENV_FORCE_PUBLISHER}" = "3.11" ]; then
+	if [ "${ENV_FORCE_PUBLISHER}" != "3.9" ] && [ "${ENV_FORCE_PUBLISHER}" != "3.10" ] && [ "${ENV_FORCE_PUBLISHER}" = "3.11" ]; then
 		PRNERR "\"ENV_FORCE_PUBLISHER\" environment:${ENV_FORCE_PUBLISHER} value must be a valid Python version(ex, 3.6/3.8/3.10...)."
 		exit 1
 	fi

diff --git a/HISTORY.rst b/HISTORY.rst
@@ -2,6 +2,12 @@
 History
 =======
 
+1.0.4 (2023-05-09)
+-------------------
+
+* Fixes the release build error
+* Updates the packaging macros
+
 1.0.3 (2023-05-08)
 -------------------
 

diff --git a/k2hr3_osnl/__init__.py b/k2hr3_osnl/__init__.py
@@ -32,7 +32,7 @@
     'version',
 ]
 __author__ = 'Hirotaka Wakabayashi <hiwakaba@yahoo-corp.jp>'
-__version__ = '1.0.3'
+__version__ = '1.0.4'
 
 import argparse
 import logging

diff --git a/python-k2hr3-osnl.spec b/python-k2hr3-osnl.spec
@@ -1,8 +1,8 @@
 %global srcname k2hr3_osnl
 %global pypi_name k2hr3-osnl
 Name:		python-k2hr3-osnl
-Version:	1.0.3
-Release:	1%{?dist}
+Version:	1.0.4
+Release:	%autorelease
 Summary:	An OpenStack notification listener for K2HR3
 
 License:	MIT
@@ -83,43 +83,4 @@ rm -rf %{buildroot}/usr/etc/k2hr3/k2hr3-osnl.conf
 %{_mandir}/man1/k2hr3-osnl.1*
 
 %changelog
-* Mon May 08 2023 Hirotaka Wakabayashi <hiwakaba@yahoo-corp.jp> 1.0.3-1
-- Update for Release Version 1.0.3
-
-* Fri Jan 13 2023 Hirotaka Wakabayashi <hiwakaba@yahoo-corp.jp> 1.0.2-1
-- Update for Release Version 1.0.2
-
-* Fri Jan 13 2023 Hirotaka Wakabayashi <hiwakaba@yahoo-corp.jp> 1.0.1-1
-- Update for Release Version 1.0.1
-
-* Fri Mar 03 2021 Hirotaka Wakabayashi <hiwakaba@yahoo-corp.jp> 1.0.0-1
-- Update for Release Version 1.0.0
-
-* Tue Dec 02 2020 Hirotaka Wakabayashi <hiwakaba@yahoo-corp.jp> 0.9.6-1
-- Update for Release Version 0.9.6
-
-* Tue Dec 01 2020 Hirotaka Wakabayashi <hiwakaba@yahoo-corp.jp> 0.9.5-1
-- Update for Release Version 0.9.5
-
-* Tue Dec 01 2020 Hirotaka Wakabayashi <hiwakaba@yahoo-corp.jp> 0.9.4-1
-- Update for Release Version 0.9.4
-
-* Mon Nov 30 2020 Hirotaka Wakabayashi <hiwakaba@yahoo-corp.jp> 0.9.3-1
-- Update for Release Version 0.9.3
-
-* Tue Mar 26 2019 Hirotaka Wakabayashi <hiwakaba@yahoo-corp.jp> 0.9.2-1
-- Update for Release Version 0.9.2
-
-* Wed Mar 20 2019 Hirotaka Wakabayashi <hiwakaba@yahoo-corp.jp> 0.9.1-2
-- Removed redundant lines
-
-* Tue Mar 19 2019 Hirotaka Wakabayashi <hiwakaba@yahoo-corp.jp> 0.9.1-1
-- Fixed systemd unitfile
-
-* Tue Mar 19 2019 Hirotaka Wakabayashi <hiwakaba@yahoo-corp.jp> 0.9.0-2
-- Used the config(noreplace) to preserve the previous config file
-- Tested on fc29 and updated oslo library versions
-
-* Wed Mar 6 2019 Hirotaka Wakabayashi <hiwakaba@yahoo-corp.jp> 0.9.0-1
-- Initial Version
-
+%autochangelog