From c1f2aae97e2e100f5b4b8038b3c1b1037f97ce01 Mon Sep 17 00:00:00 2001 From: Cleber Rosa Date: Tue, 22 Dec 2015 19:42:10 -0200 Subject: [PATCH 1/2] avocado.spec: update file locations and build requirements There has been a lot of file location updates with the plugin architecture changes. Also python-stevedore is also required at build time, because on some arches the selftests are run during the package build. Let's reflect those in the RPM packages. Signed-off-by: Cleber Rosa --- avocado.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/avocado.spec b/avocado.spec index 0cba16eb85..f5544aec4a 100644 --- a/avocado.spec +++ b/avocado.spec @@ -14,7 +14,7 @@ URL: http://avocado-framework.github.io/ Source0: https://github.com/avocado-framework/%{name}/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz BuildArch: noarch Requires: python, python-requests, fabric, pyliblzma, libvirt-python, pystache, gdb, gdb-gdbserver, python-stevedore -BuildRequires: python2-devel, python-setuptools, python-docutils, python-mock, python-psutil, python-sphinx, python-requests, aexpect, pystache, yum +BuildRequires: python2-devel, python-setuptools, python-docutils, python-mock, python-psutil, python-sphinx, python-requests, aexpect, pystache, yum, python-stevedore %if 0%{?el6} Requires: PyYAML @@ -74,8 +74,8 @@ selftests/run %{_mandir}/man1/avocado-rest-client.1.gz %{_docdir}/avocado/avocado.rst %{_docdir}/avocado/avocado-rest-client.rst -%exclude %{python_sitelib}/avocado/core/plugins/htmlresult.py* -%exclude %{python_sitelib}/avocado/core/plugins/resources/htmlresult/* +%exclude %{python_sitelib}/avocado/plugins/html.py* +%exclude %{python_sitelib}/avocado/core/resources/htmlresult/* %{_libexecdir}/avocado/avocado-bash-utils %{_libexecdir}/avocado/avocado_debug %{_libexecdir}/avocado/avocado_error @@ -92,8 +92,8 @@ directory. It also gives the user the ability to write a report on an arbitrary filesystem location. %files plugins-output-html -%{python_sitelib}/avocado/core/plugins/htmlresult.py* -%{python_sitelib}/avocado/core/plugins/resources/htmlresult/* +%{python_sitelib}/avocado/plugins/html.py* +%{python_sitelib}/avocado/core/resources/htmlresult/* %package examples Summary: Avocado Test Framework Example Tests From 56d1b41ee85202ed1d3c2cd776232ec1829a820f Mon Sep 17 00:00:00 2001 From: Cleber Rosa Date: Tue, 22 Dec 2015 19:42:10 -0200 Subject: [PATCH 2/2] Docs: use `make requirements` on Getting Started section Commit 63077e7 introduced the `make requirements` target. Let's use that on the documentation, since it can cover more scenarios such as Python 2.6 users. Signed-off-by: Cleber Rosa --- docs/source/GetStartedGuide.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/GetStartedGuide.rst b/docs/source/GetStartedGuide.rst index edacf0497b..61a0e7327d 100644 --- a/docs/source/GetStartedGuide.rst +++ b/docs/source/GetStartedGuide.rst @@ -58,7 +58,7 @@ Then to install Avocado from the git repository run:: git clone git://github.com/avocado-framework/avocado.git cd avocado - sudo pip install -r requirements.txt + sudo make requirements sudo python setup.py install Note that `python` and `pip` should point to the Python interpreter version 2.7.x.