diff options
| author | Jake Hunsaker <jhunsake@redhat.com> | 2020-04-08 11:17:50 -0400 |
|---|---|---|
| committer | Jake Hunsaker <jhunsake@redhat.com> | 2020-04-08 11:28:39 -0400 |
| commit | 6738ca63a1eab4381e436b7f5d5e0e0cc0d51953 (patch) | |
| tree | 58727963242dd1cf11fbc5a8b336fabfbc504252 | |
| parent | b0a3b9f07c49ccc58378e41618646e626679582f (diff) | |
| download | sos-6738ca63a1eab4381e436b7f5d5e0e0cc0d51953.tar.gz | |
[build] Update setuptools for new package layout, remove python2 tests
Updates setup.py to reflect project changes with 4.0, thus allowing the
'python setup.py install' checks to run normally.
Removes futures from requirements.txt, as futures is packaged with
python 3.4 and newer, and sos no longer supports python2. In that vein,
also removes the pytohn-2.7 test from the travis configuration.
Resolves: #2004
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
| -rw-r--r-- | .travis.yml | 9 | ||||
| -rw-r--r-- | requirements.txt | 1 | ||||
| -rw-r--r-- | setup.py | 6 |
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" @@ -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'], ) |