From 017b89992d0cf8fb61fe9591a4869a5ab1246769 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Mon, 7 Mar 2016 19:16:45 +0200
Subject: [PATCH] - Cleaned tox.ini a bit. - Didn't specity specific Python
versions (2 and 3). - Removed flake8 from dev dependecy list in setup.py, dev
requires just tox for testing (it installs the testing packages in the
virtualenvs).
---
setup.py | 6 +++---
tox.ini | 25 ++++++-------------------
2 files changed, 9 insertions(+), 22 deletions(-)
diff --git a/setup.py b/setup.py
index a1a3209..fcbd992 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 8c65095..42759cc 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
--
GitLab