Skip to content

Commit

Permalink
Merge pull request #11 from carsongee/rc/0.4.1
Browse files Browse the repository at this point in the history
Rc/0.4.1
  • Loading branch information
carsongee committed Dec 13, 2015
2 parents dc1ba06 + 571ee92 commit 9426b89
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
12 changes: 6 additions & 6 deletions pytest_pylint.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
from __future__ import unicode_literals
from __future__ import absolute_import
from os.path import exists
from six.moves.configparser import ( # pylint: disable=import-error
ConfigParser,
NoSectionError,
NoOptionError
)

from pylint import lint
from pylint.config import PYLINTRC
from pylint.interfaces import IReporter
from pylint.reporters import BaseReporter
import pytest
from six.moves.configparser import ( # pylint: disable=import-error
ConfigParser,
NoSectionError,
NoOptionError
)


class ProgrammaticReporter(BaseReporter):
Expand Down Expand Up @@ -64,7 +64,7 @@ def pytest_collect_file(path, parent):
config = parent.config
if not config.option.pylint:
return
if not path.ext == ".py":
if path.ext != ".py":
return
# Find pylintrc to check ignore list
pylintrc_file = config.option.pylint_rcfile or PYLINTRC
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
description='pytest plugin to check source code with pylint',
long_description=open("README.rst").read(),
license="MIT",
version='0.4.0',
version='0.4.1',
author='Carson Gee',
author_email='x@carsongee.com',
url='https://github.com/carsongee/pytest-pylint',
py_modules=['pytest_pylint'],
entry_points={'pytest11': ['pylint = pytest_pylint']},
install_requires=['pytest>=2.4', 'pylint', 'six'],
install_requires=['pytest>=2.4', 'pylint>=1.4.5', 'six'],
classifiers=[
'Development Status :: 5 - Production/Stable',
'Intended Audience :: Developers',
Expand Down

0 comments on commit 9426b89

Please sign in to comment.