aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.travis.yml9
-rw-r--r--requirements.txt1
-rw-r--r--setup.py6
3 files changed, 4 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml
index 6d7912c8..4b253633 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,15 +13,6 @@ jobs:
dist: xenial
language: shell
script: "sudo ./tests/simple.sh"
- - name: "nosetests and travis Python 2.7"
- os: linux
- dist: bionic
- language: python
- python: "2.7"
- install: pip install -r requirements.txt; python setup.py install;
- script:
- - "nosetests -v --with-cover --cover-package=sos --cover-html"
- - "sudo ./tests/simple.sh ~/virtualenv/python$TRAVIS_PYTHON_VERSION/bin/python"
- name: "nosetests and travis Python 3.5"
os: linux
dist: bionic
diff --git a/requirements.txt b/requirements.txt
index 236189eb..34bc04f9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,4 +2,3 @@ pycodestyle>=2.4.0
nose>=1.3.7
coverage>=4.0.3
Sphinx>=1.3.5
-futures;python_version<"3.4"
diff --git a/setup.py b/setup.py
index affe7311..6eab75a8 100644
--- a/setup.py
+++ b/setup.py
@@ -64,14 +64,16 @@ setup(name='sos',
""" information from a system."""),
author='Bryn M. Reeves',
author_email='bmr@redhat.com',
+ maintainer='Jake Hunsaker',
+ maintainer_email='jhunsake@redhat.com',
url='https://github.com/sosreport/sos',
license="GPLv2+",
- scripts=['sosreport'],
+ scripts=['bin/sos', 'bin/sosreport'],
data_files=[
('share/man/man1', ['man/en/sosreport.1']),
('share/man/man5', ['man/en/sos.conf.5']),
],
- packages=['sos', 'sos.plugins', 'sos.policies'],
+ packages=['sos', 'sos.report.plugins', 'sos.policies', 'sos.report'],
cmdclass={'build': BuildData, 'install_data': InstallData},
requires=['six', 'futures'],
)