diff --git a/setup.py b/setup.py index a1a3209e12e92813200e654c1a15a00c8d73ce1e..fcbd992885a3cd8ed247ff7ff49b2a3859a41c01 100644 --- a/setup.py +++ b/setup.py @@ -13,8 +13,8 @@ setup( classifiers=[ 'Development status :: 4 - Beta', 'Intended Audience :: Developers', - 'Programming Language :: Python :: 3.5', - 'Programming Language :: Python :: 2.7', + 'Programming Language :: Python :: 3', + 'Programming Language :: Python :: 2', 'Intended Audience :: System Administrators', 'Topic :: Utilities', ], @@ -22,7 +22,7 @@ setup( packages=find_packages(), install_requires=['botocore'], extras_require={ - 'dev': ['tox', 'flake8'], }, + 'dev': ['tox'], }, entry_points={ 'console_scripts': [ 'eb-prune=eb_prune:main'], }, diff --git a/tox.ini b/tox.ini index 8c6509512489c4679a298d8a5f07e587b0254894..42759ccf9adc1582cc729a8718d5f3c16b76f8ff 100644 --- a/tox.ini +++ b/tox.ini @@ -1,32 +1,19 @@ - -# this file is *not* meant to cover or endorse the use of tox or pytest or -# testing in general, -# -# It's meant to show the use of: -# -# - check-manifest -# confirm items checked into vcs are in your sdist -# - python setup.py check (using the readme_renderer extension) -# confirms your long_description will render correctly on pypi -# -# and also to help confirm pull requests to this project. - [tox] -envlist = py{27,35} +envlist = py{2,3} [testenv] basepython = - py27: python2.7 - py35: python3.5 + py2: python2 + py3: python3 deps = check-manifest - {py27,py35}: readme_renderer + readme_renderer flake8 commands = check-manifest --ignore tox.ini,tests* - # py26 doesn't have "setup.py check" - {py27,py35}: python setup.py check -m -r -s + python setup.py check -m -r -s flake8 . + [flake8] exclude = .tox,*.egg,build,data select = E,W,F