Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .flake8
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[flake8]
exclude=elasticapm/utils/wrapt,build,src,tests,dist,conftest.py,setup.py
max-line-length=120
ignore=E731
5 changes: 5 additions & 0 deletions .hound.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
flake8:
enabled: true
config_file: .flake8

fail_on_violations: true
5 changes: 0 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,6 @@ matrix:
python: 3.6
script: pip install isort && isort -c -df && echo "OK"

- stage: linters
env: LINTER="flake8"
python: 3.6
script: pip install -U flake8 flake8-per-file-ignores && flake8 elasticapm

- stage: linters
script: make docs
perl: "5.26"
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ isort:
isort -rc -vb .

flake8:
flake8 elasticapm
flake8

test:
if [[ "$$PYTHON_VERSION" =~ ^(3.5|3.6|nightly|pypy3)$$ ]] ; then \
Expand Down
8 changes: 4 additions & 4 deletions elasticapm/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
VERSION = 'unknown'

from elasticapm.base import Client
from elasticapm.conf import setup_logging
from elasticapm.instrumentation.control import instrument, uninstrument
from elasticapm.traces import (capture_span, set_context, set_custom_context,
set_transaction_name, set_user_context, tag)
from elasticapm.conf import setup_logging # noqa: F401
from elasticapm.instrumentation.control import instrument, uninstrument # noqa: F401
from elasticapm.traces import capture_span, set_context, set_custom_context # noqa: F401
from elasticapm.traces import set_transaction_name, set_user_context, tag # noqa: F401
10 changes: 1 addition & 9 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ markers =
line_length=80
indent=' '
not_skip=__init__.py
skip=wrapt,setup.py,build,src
skip=wrapt,setup.py,build,src,elasticapm/__init__.py
multi_line_output=0
known_standard_library=importlib,types,asyncio
known_django=django
Expand All @@ -29,14 +29,6 @@ known_third_party=pytest,flask,aiohttp,urllib3_mock,webob,memcache,pymongo,boto3
default_section=FIRSTPARTY
sections=FUTURE,STDLIB,DJANGO,THIRDPARTY,FIRSTPARTY,LOCALFOLDER


[flake8]
exclude=elasticapm/utils/wrapt,build,src
max-line-length=120
ignore=E731
per-file-ignores =
elasticapm/__init__.py: F401

[coverage:run]
include =
elasticapm/*
Expand Down