Merge pull request #602 from ruda/pre_release_updates

Updates for the upcoming version 0.24.0

avocado.spec

 Summary: Avocado Test Framework
 Name: avocado
-Version: 0.23.0
+Version: 0.24.0
 Release: 1%{?dist}
 License: GPLv2
 Group: Development/Tools
@@ -67,8 +67,8 @@ selftests/run selftests/all/unit
 %{_mandir}/man1/avocado-rest-client.1.gz
 %{_docdir}/avocado/avocado.rst
 %{_docdir}/avocado/avocado-rest-client.rst
-%exclude %{python_sitelib}/avocado/plugins/htmlresult.py*
-%exclude %{python_sitelib}/avocado/plugins/resources/htmlresult/*
+%exclude %{python_sitelib}/avocado/core/plugins/htmlresult.py*
+%exclude %{python_sitelib}/avocado/core/plugins/resources/htmlresult/*
 %{_libexecdir}/avocado/avocado-bash-utils
 %{_libexecdir}/avocado/avocado_debug
 %{_libexecdir}/avocado/avocado_error
@@ -85,8 +85,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/plugins/htmlresult.py*
-%{python_sitelib}/avocado/plugins/resources/htmlresult/*
+%{python_sitelib}/avocado/core/plugins/htmlresult.py*
+%{python_sitelib}/avocado/core/plugins/resources/htmlresult/*
 
 %package examples
 Summary: Avocado Test Framework Example Tests
@@ -103,6 +103,9 @@ examples of how to write tests on your own.
 %{_datadir}/avocado/api
 
 %changelog
+* Mon May 18 2015 Ruda Moura <rmoura@redhat.com> - 0.24.0-1
+- Update to upstream version 0.24.0
+
 * Tue Apr 21 2015 Lucas Meneghel Rodrigues <lmr@redhat.com> - 0.23.0-1
 - New upstream release
 

avocado/version.py

@@ -18,7 +18,7 @@ __all__ = ['MAJOR', 'MINOR', 'RELEASE', 'VERSION']
 
 
 MAJOR = 0
-MINOR = 23
+MINOR = 24
 RELEASE = 0
 
 VERSION = "%s.%s.%s" % (MAJOR, MINOR, RELEASE)

setup.py

@@ -89,7 +89,7 @@ def _get_plugin_resource_files(path):
     for root, _, files in sorted(os.walk(path)):
         for name in files:
             fullname = os.path.join(root, name)
-            flist.append(fullname[len('avocado/plugins/'):])
+            flist.append(fullname[len('avocado/core/plugins/'):])
     return flist
 
 
@@ -118,7 +118,7 @@ if __name__ == '__main__':
                     'avocado.core.restclient.cli.args',
                     'avocado.core.restclient.cli.actions'],
           package_data={'avocado.core.plugins': _get_plugin_resource_files(
-              'avocado/plugins/resources')},
+              'avocado/core/plugins/resources')},
           data_files=get_data_files(),
           scripts=['scripts/avocado',
                    'scripts/avocado-rest-client'])