From 613f9394c9aaf7055153b626e0197667e163b76e Mon Sep 17 00:00:00 2001 From: Robpol86 Date: Sat, 30 Jul 2016 15:53:45 -0700 Subject: [PATCH] {[general]install_requires} --- flake8_pep257.py | 3 +-- setup.py | 2 +- tox.ini | 8 ++++++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/flake8_pep257.py b/flake8_pep257.py index 388f10b..9332108 100644 --- a/flake8_pep257.py +++ b/flake8_pep257.py @@ -10,7 +10,6 @@ import pep257 import pep8 -import pkg_resources __author__ = '@Robpol86' __license__ = 'MIT' @@ -63,7 +62,7 @@ class Main(object): name = 'flake8-pep257' options = dict() - version = getattr(pkg_resources, 'require')('flake8-pep257')[0].version + version = __version__ def __init__(self, tree, filename): """Constructor. diff --git a/setup.py b/setup.py index bff7e11..e717cdd 100755 --- a/setup.py +++ b/setup.py @@ -53,7 +53,7 @@ def readme(): ], description='Flake8 plugin for the pep257 Python utility.', entry_points={'flake8.extension': 'D = flake8_pep257:Main'}, - install_requires=['flake8', 'pep257'], + install_requires=['flake8', 'pep257', 'pep8'], keywords='flake8 pep257 docstrings', license='MIT', long_description=readme(), diff --git a/tox.ini b/tox.ini index b5dbe99..afa7d51 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,9 @@ [general] author = @Robpol86 +install_requires = + flake8==2.5.4 + pep257==0.7.0 + pep8==1.7.0 license = MIT name = flake8_pep257 version = 1.0.5 @@ -12,7 +16,7 @@ commands = py.test --cov-append --cov-report term-missing --cov-report xml --cov {[general]name} --cov-config tox.ini \ {posargs:tests} deps = - flake8==2.5.4 + {[general]install_requires} pytest-cov==2.2.1 usedevelop = True @@ -47,8 +51,8 @@ commands = python -c "assert 'VERSION = \'{[general]version}\'' in open('setup.py').read(102400)" python -c "assert '\n{[general]version} - ' in open('README.rst').read(102400)" deps = + {[general]install_requires} coverage==4.0.3 - flake8==2.5.4 flake8-import-order==0.5 pep8-naming==0.3.3 pylint==1.5.4