Skip to content

Commit e96230c

Browse files
authored
Merge pull request #272 from jarekwg/feature/isort-flake8-settings
Add isort & flake8 settings.
2 parents 3fff4f2 + f66cf2f commit e96230c

File tree

4 files changed

+18
-2
lines changed

4 files changed

+18
-2
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ var/
2020
*.egg-info/
2121
.installed.cfg
2222
*.egg
23+
.eggs/
2324

2425
# Installer logs
2526
pip-log.txt

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@ env:
2626

2727
- DJANGO=">=1.10,<1.11" DRF=">=3.4,<3.5"
2828
before_install:
29-
# Force an upgrade of py to avoid VersionConflict
29+
# Force an upgrade of py & pytest to avoid VersionConflict
3030
- pip install --upgrade py
31+
- pip install "pytest>=2.8,<3"
3132
- pip install codecov
3233
install:
3334
- pip install Django${DJANGO} djangorestframework${DRF}

setup.cfg

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,17 @@ test = pytest
33

44
[wheel]
55
universal = 1
6+
7+
[flake8]
8+
ignore = E501
9+
max-line-length = 100
10+
11+
[isort]
12+
known_django = django
13+
sections = FUTURE,STDLIB,THIRDPARTY,DJANGO,FIRSTPARTY,LOCALFOLDER
14+
default_section = THIRDPARTY
15+
known_standard_library = factory,mock,requests
16+
known_first_party = rest_framework_json_api
17+
multi_line_output = 3
18+
line_length = 100
19+
indent = 4

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ def get_package_data(package):
105105
tests_require=[
106106
'pytest-factoryboy',
107107
'pytest-django',
108-
'pytest>=2.8',
108+
'pytest>=2.8,<3',
109109
] + mock,
110110
zip_safe=False,
111111
)

0 commit comments

Comments
 (0)