Merge pull request #34 from carsongee/rc/0.8.0

Rc/0.8.0

.travis.yml

@@ -1,7 +1,6 @@
 language: python
 python:
   - "2.7"
-  - "3.3"
   - "3.4"
   - "3.5"
   - "3.6"

README.rst

@@ -47,6 +47,12 @@ This code is heavily based on
 Releases
 ========
 
+0.8.0
+~~~~~
+
+- `bdrung <https://github.com/bdrung>`_ corrected inconsitent returns in a function
+- Dropped Python 3.3 support
+
 0.7.1
 ~~~~~
 

pytest_pylint.py

@@ -117,9 +117,9 @@ def pytest_collect_file(path, parent):
     """Collect files on which pylint should run"""
     config = parent.config
     if not config.option.pylint:
-        return
+        return None
     if path.ext != ".py":
-        return
+        return None
     rel_path = get_rel_path(path.strpath, parent.fspath.strpath)
     if parent.pylint_config is None:
         parent.pylint_files.add(rel_path)
@@ -131,6 +131,7 @@ def pytest_collect_file(path, parent):
         return PyLintItem(
             path, parent, parent.pylint_msg_template, parent.pylintrc_file
         )
+    return None
 
 
 def pytest_collection_finish(session):

setup.py

@@ -12,8 +12,8 @@
     name='pytest-pylint',
     description='pytest plugin to check source code with pylint',
     long_description=open("README.rst").read(),
-    license="MIT",
-    version='0.7.1',
+    license='MIT',
+    version='0.8.0',
     author='Carson Gee',
     author_email='[email protected]',
     url='https://github.com/carsongee/pytest-pylint',
@@ -25,7 +25,8 @@
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
     ],
 )

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py33,py34,py35,py36
+envlist = py27,py34,py35,py36
 skip_missing_interpreters =
     true
 [testenv]