Merge pull request #270 from lmr/sdist-fixes

Sdist fixes

MANIFEST.in

 include README.rst
 include LICENSE
-recursive-include avocado/plugins/resources

README

+README.rst
\ No newline at end of file

avocado.spec

@@ -4,7 +4,7 @@ Version: 0.14.0
 Release: 1%{?dist}
 License: GPLv2
 Group: Development/Tools
-URL: http://avocado-framework.readthedocs.org/
+URL: https://github.com/avocado-framework/avocado
 Source: avocado-%{version}.tar.gz
 BuildRequires: python2-devel, python-docutils, python-yaml
 BuildArch: noarch

avocado/linux/software_manager.py

@@ -353,7 +353,7 @@ class YumBackend(RpmBackend):
         executable = process.find_command('yum')
         base_arguments = '-y'
         self.base_command = executable + ' ' + base_arguments
-        self.repo_file_path = '/etc/yum.repos.d/autotest.repo'
+        self.repo_file_path = '/etc/yum.repos.d/avocado-managed.repo'
         self.cfgparser = ConfigParser.ConfigParser()
         self.cfgparser.read(self.repo_file_path)
         y_cmd = executable + ' --version | head -1'
@@ -425,7 +425,7 @@ class YumBackend(RpmBackend):
             if not self.cfgparser.has_section(section_name):
                 break
         self.cfgparser.add_section(section_name)
-        self.cfgparser.set(section_name, 'name', 'Autotest managed repository')
+        self.cfgparser.set(section_name, 'name', 'Avocado managed repository')
         self.cfgparser.set(section_name, 'url', url)
         self.cfgparser.set(section_name, 'enabled', 1)
         self.cfgparser.set(section_name, 'gpgcheck', 0)
@@ -625,7 +625,7 @@ class AptBackend(DpkgBackend):
         super(AptBackend, self).__init__()
         executable = process.find_command('apt-get')
         self.base_command = executable + ' -y'
-        self.repo_file_path = '/etc/apt/sources.list.d/autotest'
+        self.repo_file_path = '/etc/apt/sources.list.d/avocado.list'
         cmd_result = process.run('apt-get -v | head -1',
                                  ignore_status=True,
                                  verbose=False,

setup.cfg

 [metadata]
 name = avocado
-version = 0.10.1
+version = 0.14.0
 summary = Avocado Test Framework
 description-file =
     README.rst
 author = Avocado developers
-author-email = autotest-kernel@redhat.com
+author-email = avocado-devel@redhat.com
 home-page = https://github.com/avocado-framework/avocado
 classifier =
     Intended Audience :: Information Technology

setup.py

@@ -16,7 +16,11 @@
 import glob
 import os
 # pylint: disable=E0611
-from distutils.core import setup
+
+try:
+    from setuptools import setup
+except ImportError:
+    from distutils.core import setup
 
 import avocado.version
 
@@ -71,11 +75,28 @@ def _get_plugin_resource_files(path):
     return flist
 
 
+def get_requirements():
+    requirements = []
+    with open('requirements.txt', 'r') as req:
+        req_contents = req.read()
+        for line in req_contents.splitlines():
+            if not line.startswith("#"):
+                line = line.split("#")[0].strip()
+                requirements.append("%s" % line)
+    return requirements
+
+
+def get_long_description():
+    with open('README.rst', 'r') as req:
+        req_contents = req.read()
+    return req_contents
+
 setup(name='avocado',
       version=avocado.version.VERSION,
       description='Avocado Test Framework',
-      author='Lucas Meneghel Rodrigues',
-      author_email='lmr@redhat.com',
+      long_description=get_long_description(),
+      author='Avocado Developers',
+      author_email='avocado-devel@redhat.com',
       url='http://github.com/avocado-framework/avocado',
       packages=['avocado',
                 'avocado.cli',
@@ -86,4 +107,5 @@ setup(name='avocado',
                 'avocado.plugins'],
       package_data={'avocado.plugins': _get_plugin_resource_files('avocado/plugins/resources')},
       data_files=get_data_files(),
-      scripts=['scripts/avocado'])
+      scripts=['scripts/avocado'],
+      install_requires=get_requirements())