Skip to content

Commit 4a54ec0

Browse files
committed
Update CI.
1 parent 88a1a96 commit 4a54ec0

File tree

3 files changed

+29
-13
lines changed

3 files changed

+29
-13
lines changed

.travis.yml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
1-
sudo: required
2-
1+
dist: xenial
32
language: python
4-
3+
sudo: false
54
python:
6-
- "2.7"
7-
- "3.5"
8-
- "3.6"
9-
5+
- 3.5
6+
- 3.6
7+
- 3.7
108
install:
11-
- pip install tox-travis
12-
9+
- pip install -U pip setuptools
10+
- pip install pytest-runner
1311
script:
14-
- tox
12+
- python setup.py test
1513

1614
notifications:
1715
email:

setup.cfg

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,12 @@ description-file = README.md
44

55
[tool:pytest]
66
DJANGO_SETTINGS_MODULE=tests.django_settings
7-
addopts= --doctest-modules --flake8 --pep8 --nomigrations
7+
addopts= --doctest-modules --flake8 --nomigrations
88
testpaths = django_admin_json_editor tests
99

10-
pep8maxlinelength = 99
10+
flake8-max-complexity = 10
1111
flake8-max-line-length = 99
12+
13+
[isort]
14+
force_single_line = false
15+
import_heading_localfolder = true

setup.py

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,17 @@
1414
# allow setup.py to be run from any path
1515
os.chdir(project_path)
1616

17+
requirements = [
18+
'Django',
19+
]
20+
21+
test_requirements = [
22+
'pytest',
23+
'pytest-runner',
24+
'pytest-flake8',
25+
'flake8-isort',
26+
]
27+
1728
setup(
1829
name='django-admin-json-editor',
1930
version=VERSION,
@@ -35,8 +46,11 @@
3546
'Programming Language :: Python :: 3',
3647
'Programming Language :: Python :: 3.5',
3748
'Programming Language :: Python :: 3.6',
49+
'Programming Language :: Python :: 3.7',
3850
'Topic :: Internet :: WWW/HTTP',
3951
'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
4052
],
41-
install_requires=['Django'],
53+
install_requires=requirements,
54+
test_suite='tests',
55+
tests_require=test_requirements,
4256
)

0 commit comments

Comments
 (0)