summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoman Joost <rjoost@redhat.com>2016-04-01 09:43:26 +1000
committerRoman Joost <rjoost@redhat.com>2016-04-01 09:43:26 +1000
commit7ec00b14c8ff4873614eccce15728546ee15e642 (patch)
tree4d123c92dd914266c530cf1e61bb50130e12ed25
parentf66c092be03ff20dbce5fa56b3972b6720f4a69d (diff)
Automatic commit of release 22.3beaker-22.3
-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 dea2358..13153f7 100644
--- a/Client/setup.py
+++ b/Client/setup.py
@@ -13,7 +13,7 @@ def bash_completion_dir():
setup(
name = "bkr.client",
- version='beaker-22.3',
+ version='22.3',
license = "GPLv2+",
packages=find_packages('src'),
diff --git a/Common/bkr/common/__init__.py b/Common/bkr/common/__init__.py
index 1ab4626..e672a71 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__ = 'beaker-22.3'
+__version__ = '22.3'
diff --git a/Common/setup.py b/Common/setup.py
index da77ae5..390bc2f 100644
--- a/Common/setup.py
+++ b/Common/setup.py
@@ -12,7 +12,7 @@ from setuptools import setup, find_packages
setup(
name = "bkr",
- version='beaker-22.3',
+ version='22.3',
license = "GPLv2+",
packages=find_packages('.'),
diff --git a/IntegrationTests/setup.py b/IntegrationTests/setup.py
index 6a8bc35..b015845 100644
--- a/IntegrationTests/setup.py
+++ b/IntegrationTests/setup.py
@@ -12,7 +12,7 @@ def get_compose_layout():
setup(
name='bkr.inttest',
- version='beaker-22.3',
+ version='22.3',
packages=find_packages('src'),
package_dir={'': 'src'},
package_data={'': [
diff --git a/LabController/setup.py b/LabController/setup.py
index b8734d2..75d5aab 100644
--- a/LabController/setup.py
+++ b/LabController/setup.py
@@ -48,7 +48,7 @@ else:
setup(
name = "bkr.labcontroller",
- version='beaker-22.3',
+ version='22.3',
license = "GPLv2+",
install_requires=[
diff --git a/Server/setup.py b/Server/setup.py
index 3cdee7b..fedee14 100644
--- a/Server/setup.py
+++ b/Server/setup.py
@@ -195,7 +195,7 @@ else:
setup(
name="bkr.server",
namespace_packages = ['bkr'],
- version='beaker-22.3',
+ version='22.3',
# 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 4e29202..1240c75 100644
--- a/beaker.spec
+++ b/beaker.spec
@@ -20,10 +20,10 @@
# 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 beaker-22.3
+%global upstream_version 22.3
Name: beaker
-Version: beaker-22.3
+Version: 22.3
Release: 1%{?dist}
Summary: Full-stack software and hardware integration testing system
Group: Applications/Internet