Skip to content

Commit 6601ade

Browse files
committed
added .hound.yml and updated config (#155)
closes #155
1 parent 45e56c7 commit 6601ade

File tree

6 files changed

+15
-19
lines changed

6 files changed

+15
-19
lines changed

.flake8

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[flake8]
2+
exclude=elasticapm/utils/wrapt,build,src,tests,dist,conftest.py,setup.py
3+
max-line-length=120
4+
ignore=E731

.hound.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
flake8:
2+
enabled: true
3+
config_file: .flake8
4+
5+
fail_on_violations: true

.travis.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,6 @@ matrix:
2727
python: 3.6
2828
script: pip install isort && isort -c -df && echo "OK"
2929

30-
- stage: linters
31-
env: LINTER="flake8"
32-
python: 3.6
33-
script: pip install -U flake8 flake8-per-file-ignores && flake8 elasticapm
34-
3530
- stage: linters
3631
script: make docs
3732
perl: "5.26"

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ isort:
55
isort -rc -vb .
66

77
flake8:
8-
flake8 elasticapm
8+
flake8
99

1010
test:
1111
if [[ "$$PYTHON_VERSION" =~ ^(3.5|3.6|nightly|pypy3)$$ ]] ; then \

elasticapm/__init__.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
VERSION = 'unknown'
1919

2020
from elasticapm.base import Client
21-
from elasticapm.conf import setup_logging
22-
from elasticapm.instrumentation.control import instrument, uninstrument
23-
from elasticapm.traces import (capture_span, set_context, set_custom_context,
24-
set_transaction_name, set_user_context, tag)
21+
from elasticapm.conf import setup_logging # noqa: F401
22+
from elasticapm.instrumentation.control import instrument, uninstrument # noqa: F401
23+
from elasticapm.traces import capture_span, set_context, set_custom_context # noqa: F401
24+
from elasticapm.traces import set_transaction_name, set_user_context, tag # noqa: F401

setup.cfg

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ markers =
2020
line_length=80
2121
indent=' '
2222
not_skip=__init__.py
23-
skip=wrapt,setup.py,build,src
23+
skip=wrapt,setup.py,build,src,elasticapm/__init__.py
2424
multi_line_output=0
2525
known_standard_library=importlib,types,asyncio
2626
known_django=django
@@ -29,14 +29,6 @@ known_third_party=pytest,flask,aiohttp,urllib3_mock,webob,memcache,pymongo,boto3
2929
default_section=FIRSTPARTY
3030
sections=FUTURE,STDLIB,DJANGO,THIRDPARTY,FIRSTPARTY,LOCALFOLDER
3131

32-
33-
[flake8]
34-
exclude=elasticapm/utils/wrapt,build,src
35-
max-line-length=120
36-
ignore=E731
37-
per-file-ignores =
38-
elasticapm/__init__.py: F401
39-
4032
[coverage:run]
4133
include =
4234
elasticapm/*

0 commit comments

Comments
 (0)