提交 bb8ca086 编写于 作者: C Cleber Rosa

Optional plugins: do not depend on the VERSION file

Simply because this file won't be available when being installed
from any method outside the source tree.

The downside is obvious: it requires extra steps when doing a new
release.  But that is still better than not being able to ship
these plugins to users using the standard Python mechanisms.
Signed-off-by: NCleber Rosa <crosa@redhat.com>
上级 cb05986c
......@@ -11,60 +11,119 @@ details you need to pay attention to.
Bump the version number
=======================
Go through the avocado code base and update the release number. At the time
of this writing, the diff looked like this:
For the core Avocado versioning, two files need to receive a version update:
* ``VERSION``
* ``python-avocado.spec``
So, go through the Avocado code base and update the version number. At
the time of this writing, the diff looks like this:
.. code-block:: diff
diff --git a/avocado.spec b/avocado.spec
index eb910e8..21313ca 100644
--- a/avocado.spec
+++ b/avocado.spec
@@ -1,7 +1,7 @@
Summary: Avocado Test Framework
Name: avocado
-Version: 0.28.0
-Release: 2%{?dist}
+Version: 0.29.0
diff --git a/VERSION b/VERSION
index 98bc1f4..dd0353d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-47.0
+48.0
diff --git a/python-avocado.spec b/python-avocado.spec
index 7071805..483ebce 100644
--- a/python-avocado.spec
+++ b/python-avocado.spec
@@ -6,8 +6,8 @@
Summary: Framework with tools and libraries for Automated Testing
Name: python-%{srcname}
-Version: 47.0
-Release: 1%{?dist}
+Version: 48.0
+Release: 0%{?dist}
License: GPLv2
Group: Development/Tools
URL: http://avocado-framework.github.io/
@@ -104,6 +104,9 @@ examples of how to write tests on your own.
@@ -211,6 +211,9 @@ examples of how to write tests on your own.
%{_datadir}/avocado/wrappers
%changelog
+* Wed Oct 7 2015 Lucas Meneghel Rodrigues <lmr@redhat.com> - 0.29.0-0
+- New upstream release 0.29.0
+* Mon Apr 3 2017 Cleber Rosa <cleber@redhat.com> - 48.0-0
+- New upstream release
+
* Wed Sep 16 2015 Lucas Meneghel Rodrigues <lmr@redhat.com> - 0.28.0-2
- Add pystache, aexpect, psutil, sphinx and yum/dnf dependencies for functional/unittests
diff --git a/avocado/core/version.py b/avocado/core/version.py
index c927b19..a555af5 100755
--- a/avocado/core/version.py
+++ b/avocado/core/version.py
@@ -18,7 +18,7 @@ __all__ = ['MAJOR', 'MINOR', 'RELEASE', 'VERSION']
MAJOR = 0
-MINOR = 28
+MINOR = 29
RELEASE = 0
VERSION = "%s.%s.%s" % (MAJOR, MINOR, RELEASE)
diff --git a/setup.cfg b/setup.cfg
index 76953b9..5cf90e9 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
[metadata]
name = avocado
-version = 0.28.0
+version = 0.29.0
summary = Avocado Test Framework
description-file =
README.rst
* Wed Mar 8 2017 Cleber Rosa <cleber@redhat.com> - 47.0-1
- Rename package to python-avocado and subpackges accordingly
Then, for all the optional plugins, the version number on their
``setup.py`` files also needs to be bumped. Currently, the diff looks
like this:
.. code-block:: diff
diff --git a/optional_plugins/html/setup.py b/optional_plugins/html/setup.py
index eb8d584..4ba8675 100644
--- a/optional_plugins/html/setup.py
+++ b/optional_plugins/html/setup.py
@@ -19,7 +19,7 @@ from setuptools import setup, find_packages
setup(name='avocado_result_html',
description='Avocado HTML Report for Jobs',
- version='47.0',
+ version='48.0',
author='Avocado Developers',
author_email='avocado-devel@redhat.com',
url='http://avocado-framework.github.io/',
diff --git a/optional_plugins/robot/setup.py b/optional_plugins/robot/setup.py
index 1f44b72..700eba0 100644
--- a/optional_plugins/robot/setup.py
+++ b/optional_plugins/robot/setup.py
@@ -19,7 +19,7 @@ from setuptools import setup, find_packages
setup(name='avocado-robot',
description='Avocado Plugin for Execution of Robot Framework tests',
- version='47.0',
+ version='48.0',
author='Avocado Developers',
author_email='avocado-devel@redhat.com',
url='http://avocado-framework.github.io/',
diff --git a/optional_plugins/runner_docker/setup.py b/optional_plugins/runner_docker/setup.py
index 2d235c8..954c6e7 100644
--- a/optional_plugins/runner_docker/setup.py
+++ b/optional_plugins/runner_docker/setup.py
@@ -19,7 +19,7 @@ from setuptools import setup, find_packages
setup(name='avocado-runner-docker',
description='Avocado Runner for Execution on Docker Containers',
- version='47.0',
+ version='48.0',
author='Avocado Developers',
author_email='avocado-devel@redhat.com',
url='http://avocado-framework.github.io/',
diff --git a/optional_plugins/runner_remote/setup.py b/optional_plugins/runner_remote/setup.py
index 5fe58dc..5aae9c5 100644
--- a/optional_plugins/runner_remote/setup.py
+++ b/optional_plugins/runner_remote/setup.py
@@ -19,7 +19,7 @@ from setuptools import setup, find_packages
setup(name='avocado-runner-remote',
description='Avocado Runner for Remote Execution',
- version='47.0',
+ version='48.0',
author='Avocado Developers',
author_email='avocado-devel@redhat.com',
url='http://avocado-framework.github.io/',
diff --git a/optional_plugins/runner_vm/setup.py b/optional_plugins/runner_vm/setup.py
index 168464a..44b56e7 100644
--- a/optional_plugins/runner_vm/setup.py
+++ b/optional_plugins/runner_vm/setup.py
@@ -19,7 +19,7 @@ from setuptools import setup, find_packages
setup(name='avocado-runner-vm',
description='Avocado Runner for libvirt VM Execution',
- version='47.0',
+ version='48.0',
author='Avocado Developers',
author_email='avocado-devel@redhat.com',
url='http://avocado-framework.github.io/',
You can find on git such commits that will help you get oriented for other
repos.
......
......@@ -13,17 +13,12 @@
# Copyright: Red Hat Inc. 2016
# Author: Cleber Rosa <crosa@redhat.com>
import os
from setuptools import setup, find_packages
root_path = os.path.abspath(os.path.join("..", ".."))
version_file = os.path.join(root_path, 'VERSION')
VERSION = open(version_file, 'r').read().strip()
setup(name='avocado-framework-plugin-result-html',
description='Avocado HTML Report for Jobs',
version=VERSION,
version='47.0',
author='Avocado Developers',
author_email='avocado-devel@redhat.com',
url='http://avocado-framework.github.io/',
......
......@@ -13,17 +13,12 @@
# Copyright: Red Hat Inc. 2017
# Author: Amador Pahim <apahim@redhat.com>
import os
from setuptools import setup, find_packages
root_path = os.path.abspath(os.path.join("..", ".."))
version_file = os.path.join(root_path, 'VERSION')
VERSION = open(version_file, 'r').read().strip()
setup(name='avocado-framework-plugin-robot',
description='Avocado Plugin for Execution of Robot Framework tests',
version=VERSION,
version='47.0',
author='Avocado Developers',
author_email='avocado-devel@redhat.com',
url='http://avocado-framework.github.io/',
......
......@@ -13,17 +13,12 @@
# Copyright: Red Hat Inc. 2017
# Author: Cleber Rosa <crosa@redhat.com>
import os
from setuptools import setup, find_packages
root_path = os.path.abspath(os.path.join("..", ".."))
version_file = os.path.join(root_path, 'VERSION')
VERSION = open(version_file, 'r').read().strip()
setup(name='avocado-framework-plugin-runner-docker',
description='Avocado Runner for Execution on Docker Containers',
version=VERSION,
version='47.0',
author='Avocado Developers',
author_email='avocado-devel@redhat.com',
url='http://avocado-framework.github.io/',
......
......@@ -13,17 +13,12 @@
# Copyright: Red Hat Inc. 2017
# Author: Cleber Rosa <crosa@redhat.com>
import os
from setuptools import setup, find_packages
root_path = os.path.abspath(os.path.join("..", ".."))
version_file = os.path.join(root_path, 'VERSION')
VERSION = open(version_file, 'r').read().strip()
setup(name='avocado-framework-plugin-runner-remote',
description='Avocado Runner for Remote Execution',
version=VERSION,
version='47.0',
author='Avocado Developers',
author_email='avocado-devel@redhat.com',
url='http://avocado-framework.github.io/',
......
......@@ -13,17 +13,12 @@
# Copyright: Red Hat Inc. 2017
# Author: Cleber Rosa <crosa@redhat.com>
import os
from setuptools import setup, find_packages
root_path = os.path.abspath(os.path.join("..", ".."))
version_file = os.path.join(root_path, 'VERSION')
VERSION = open(version_file, 'r').read().strip()
setup(name='avocado-framework-plugin-runner-vm',
description='Avocado Runner for libvirt VM Execution',
version=VERSION,
version='47.0',
author='Avocado Developers',
author_email='avocado-devel@redhat.com',
url='http://avocado-framework.github.io/',
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册