summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Callaghan <dcallagh@redhat.com>2016-01-14 14:17:55 +1000
committerDan Callaghan <dcallagh@redhat.com>2016-01-14 14:17:55 +1000
commitc175a7207f0f59b4152c48787b12873d7e1ad361 (patch)
tree67e2e6d4a8d347caa3058ba8e67047100083907c
parentfba885c48a22a6d12155a131f35c4771feee7c63 (diff)
Automatic commit of release 22.0beaker-22.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
-rw-r--r--Server/setup.py2
-rw-r--r--beaker.spec4
7 files changed, 8 insertions, 8 deletions
diff --git a/Client/setup.py b/Client/setup.py
index c033622..6718c25 100644
--- a/Client/setup.py
+++ b/Client/setup.py
@@ -13,7 +13,7 @@ def bash_completion_dir():
setup(
name = "bkr.client",
- version='22.0rc1',
+ version='22.0',
license = "GPLv2+",
packages=find_packages('src'),
diff --git a/Common/bkr/common/__init__.py b/Common/bkr/common/__init__.py
index 1b407e0..8c6fd1d 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__ = '22.0rc1'
+__version__ = '22.0'
diff --git a/Common/setup.py b/Common/setup.py
index cacd15c..7b7fb47 100644
--- a/Common/setup.py
+++ b/Common/setup.py
@@ -12,7 +12,7 @@ from setuptools import setup, find_packages
setup(
name = "bkr",
- version='22.0rc1',
+ version='22.0',
license = "GPLv2+",
packages=find_packages('.'),
diff --git a/IntegrationTests/setup.py b/IntegrationTests/setup.py
index c420ea7..f40e81b 100644
--- a/IntegrationTests/setup.py
+++ b/IntegrationTests/setup.py
@@ -12,7 +12,7 @@ def get_compose_layout():
setup(
name='bkr.inttest',
- version='22.0rc1',
+ version='22.0',
packages=find_packages('src'),
package_dir={'': 'src'},
package_data={'': [
diff --git a/LabController/setup.py b/LabController/setup.py
index a09028d..ed60582 100644
--- a/LabController/setup.py
+++ b/LabController/setup.py
@@ -48,7 +48,7 @@ else:
setup(
name = "bkr.labcontroller",
- version='22.0rc1',
+ version='22.0',
license = "GPLv2+",
install_requires=[
diff --git a/Server/setup.py b/Server/setup.py
index db9f428..2d7bb42 100644
--- a/Server/setup.py
+++ b/Server/setup.py
@@ -195,7 +195,7 @@ else:
setup(
name="bkr.server",
namespace_packages = ['bkr'],
- version='22.0rc1',
+ version='22.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 f4fc97b..ea439c7 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 22.0rc1
+%global upstream_version 22.0
Name: beaker
Version: 22.0
-Release: 0.rc1%{?dist}
+Release: 1%{?dist}
Summary: Full-stack software and hardware integration testing system
Group: Applications/Internet
License: GPLv2+ and BSD