summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Callaghan <dcallagh@redhat.com>2016-07-07 15:17:36 +1000
committerDan Callaghan <dcallagh@redhat.com>2016-07-07 15:17:36 +1000
commite1ff03dbec219e63bef93a69e038b5332e827ec8 (patch)
tree1e3960928a6c25d3be3d4e33a319807864d377c3
parent436d28cc3a41b5a9ff9299c1b8266efc2fff7fe8 (diff)
Automatic commit of release 23.0beaker-23.0
-rw-r--r--Client/setup.py2
-rw-r--r--Common/bkr/common/__init__.py2
-rw-r--r--Common/setup.py2
-rw-r--r--IntegrationTests/setup.py2
-rw-r--r--LabController/setup.py2
-rwxr-xr-xMisc/tag-release.sh2
-rw-r--r--Server/setup.py2
-rw-r--r--beaker.spec4
8 files changed, 9 insertions, 9 deletions
diff --git a/Client/setup.py b/Client/setup.py
index b129d70..f509a56 100644
--- a/Client/setup.py
+++ b/Client/setup.py
@@ -13,7 +13,7 @@ def bash_completion_dir():
setup(
name = "bkr.client",
- version='23.0rc1',
+ version='23.0',
license = "GPLv2+",
packages=find_packages('src'),
diff --git a/Common/bkr/common/__init__.py b/Common/bkr/common/__init__.py
index a6ce3e1..7d234e9 100644
--- a/Common/bkr/common/__init__.py
+++ b/Common/bkr/common/__init__.py
@@ -2,4 +2,4 @@
# code in bkr.__init__), the version details are retrieved from here in
# order to correctly handle module shadowing on sys.path
-__version__ = '23.0rc1'
+__version__ = '23.0'
diff --git a/Common/setup.py b/Common/setup.py
index 8bd2245..6c3b0ad 100644
--- a/Common/setup.py
+++ b/Common/setup.py
@@ -12,7 +12,7 @@ from setuptools import setup, find_packages
setup(
name = "bkr",
- version='23.0rc1',
+ version='23.0',
license = "GPLv2+",
packages=find_packages('.'),
diff --git a/IntegrationTests/setup.py b/IntegrationTests/setup.py
index 715e871..5a6c1b2 100644
--- a/IntegrationTests/setup.py
+++ b/IntegrationTests/setup.py
@@ -12,7 +12,7 @@ def get_compose_layout():
setup(
name='bkr.inttest',
- version='23.0rc1',
+ version='23.0',
packages=find_packages('src'),
package_dir={'': 'src'},
package_data={'': [
diff --git a/LabController/setup.py b/LabController/setup.py
index 94c7e5d..dcfa963 100644
--- a/LabController/setup.py
+++ b/LabController/setup.py
@@ -48,7 +48,7 @@ else:
setup(
name = "bkr.labcontroller",
- version='23.0rc1',
+ version='23.0',
license = "GPLv2+",
install_requires=[
diff --git a/Misc/tag-release.sh b/Misc/tag-release.sh
index 3f3c713..74c9f40 100755
--- a/Misc/tag-release.sh
+++ b/Misc/tag-release.sh
@@ -32,4 +32,4 @@ sed -i -e "/version=/c\ version='$version$prerelease'," */setup.py
sed -i -e "/__version__/c\__version__ = '$version$prerelease'" Common/bkr/common/__init__.py
git add beaker.spec */setup.py Common/bkr/common/__init__.py
git commit -m "Automatic commit of release $version$prerelease"
-git tag -a "beaker-$version$prerelease" -m "Tagging release $version$prerelease"
+git tag -s -a "beaker-$version$prerelease" -m "Tagging release $version$prerelease"
diff --git a/Server/setup.py b/Server/setup.py
index ece8f94..68b23a7 100644
--- a/Server/setup.py
+++ b/Server/setup.py
@@ -195,7 +195,7 @@ else:
setup(
name="bkr.server",
namespace_packages = ['bkr'],
- version='23.0rc1',
+ version='23.0',
# uncomment the following lines if you fill them out in release.py
description=description,
author=author,
diff --git a/beaker.spec b/beaker.spec
index 4922e81..29c76f8 100644
--- a/beaker.spec
+++ b/beaker.spec
@@ -20,11 +20,11 @@
# not representable in RPM. For example, a release candidate might be 0.15.0rc1
# but that is not usable for the RPM Version because it sorts higher than
# 0.15.0, so the RPM will have Version 0.15.0 and Release 0.rc1 in that case.
-%global upstream_version 23.0rc1
+%global upstream_version 23.0
Name: beaker
Version: 23.0
-Release: 0.rc1%{?dist}
+Release: 1%{?dist}
Summary: Full-stack software and hardware integration testing system
Group: Applications/Internet
License: GPLv2+ and BSD