Skip to content

Commit

Permalink
Make this properly build, and test on Python 3.8
Browse files Browse the repository at this point in the history
from_parent() will only take 2 arguments, so make the rest optional
when setting them manually.

Also add Python 3.8 to platforms we run tests on.

Bump version.
  • Loading branch information
tholo committed Apr 23, 2020
1 parent 92de336 commit fc1c9cf
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 5 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ matrix:
env: TOXENV=py36-xdist
- python: 3.7
env: TOXENV=py37
- python: 3.8
env: TOXENV=py38
- python: pypy2.7-6.0
env: TOXENV=pypy
- python: pypy3.5-6.0
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
1.0.5
-----

- Fix deprecation warning; from @jonasundderwolf

1.0.4
-----

Expand Down
6 changes: 3 additions & 3 deletions pytest_flake8.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,9 @@ class Flake8Error(Exception):

class Flake8Item(pytest.Item, pytest.File):

def __init__(self, path, parent, flake8ignore, maxlength,
maxcomplexity, showshource, statistics):
super(Flake8Item, self).__init__(path, parent)
def __init__(self, fspath, parent, flake8ignore=None, maxlength=None,
maxcomplexity=None, showshource=None, statistics=None):
super(Flake8Item, self).__init__(fspath, parent)
self._nodeid += "::FLAKE8"
self.add_marker("flake8")
self.flake8ignore = flake8ignore
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

setup(
name='pytest-flake8',
version='1.0.4',
version='1.0.5',
description='pytest plugin to check FLAKE8 requirements',
long_description=open("README.rst").read(),
classifiers=[
Expand Down
3 changes: 2 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist=py27,py36-pytesttrunk,py36-xdist,py34,py35,py36,py37,pypy,pypy3
envlist=py27,py36-pytesttrunk,py36-xdist,py34,py35,py36,py37,py38,pypy,pypy3

[testenv]
deps=pytest
Expand All @@ -18,6 +18,7 @@ commands=

[pytest]
addopts=--flake8
junit_family=xunit1

[flake8]
ignore=E128

0 comments on commit fc1c9cf

Please sign in to comment.