Skip to content

Commit

Permalink
Require pylint >= 2.0. Fix #173
Browse files Browse the repository at this point in the history
also drop testing with Python 2.7 b/c pylint 2.0 is compatible
only with Python 3
  • Loading branch information
atodorov committed Jul 16, 2018
1 parent e1900f0 commit ff3677f
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 15 deletions.
3 changes: 0 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
language: python
python:
- 2.7
- 3.4
- 3.5
- 3.6
Expand All @@ -18,7 +17,6 @@ stages:
matrix:
exclude:
# Python/Django combinations that aren't officially supported
- { python: 2.7, env: DJANGO=2.0 }
- { python: "3.7-dev", env: DJANGO=1.11 }
include:
- { stage: django_not_installed, python: 3.6, env: TOXENV=django_not_installed }
Expand All @@ -29,7 +27,6 @@ matrix:
- { stage: build_and_package_sanity, python: 3.6, env: SANITY_CHECK=1 }
allow_failures:
- env: TOXENV=pylint
- python: 2.7

install:
- pip install tox-travis
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@ Changelog
Unreleased
----------

- Requires pylint >= 2.0 which doesn't support Python 2 anymore!

- Add modelform-uses-unicode check to flag dangerous use of the exclude
attribute in ModelForm.Meta.


Version 0.11.1 (25 May 2018), the DjangoCon Heidelberg edittion
---------------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
include_package_data=True,
install_requires=[
'pylint-plugin-utils>=0.4',
'pylint>=1.8.2',
'pylint>=2.0',
],
extras_require={
'with_django': ['Django'],
Expand Down
21 changes: 10 additions & 11 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ envlist =
flake8
pylint
readme
py{27,34,35,36}-django111
py{34,35,36}-django111
py{34,35,36,37}-django20

[testenv]
Expand All @@ -18,8 +18,7 @@ commands =
flake8: flake8
pylint: pylint --rcfile=tox.ini -d missing-docstring --ignore=tests pylint_django setup
readme: python setup.py check --restructuredtext --strict
py{27,34,35,36}-django111: coverage run pylint_django/tests/test_func.py -v
py{34,35,36,37}-django20: coverage run pylint_django/tests/test_func.py -v
py{34,35,36,37}-django{111,20}: coverage run pylint_django/tests/test_func.py -v
clean: find . -type f -name '*.pyc' -delete
clean: find . -type d -name __pycache__ -delete
clean: rm -rf build/ .cache/ dist/ .eggs/ pylint_django.egg-info/ .tox/
Expand All @@ -33,14 +32,14 @@ deps =
django20: Django>=2.0,<2.1
py{37}: https://github.com/PyCQA/astroid/tarball/master#egg=astroid-master
py{37}: https://github.com/PyCQA/pylint/tarball/master#egg=pylint-master
py{27,34,35,36,37}: coverage
py{27,34,35,36,37}: djangorestframework
py{27,34,35,36,37}: django-model-utils
py{27,34,35,36,37}: django-tables2
py{27,34,35,36,37}: factory-boy
py{27,34,35,36,37}: psycopg2
py{27,34,35,36,37}: pylint-plugin-utils
py{27,34,35,36,37}: pytest
py{34,35,36,37}: coverage
py{34,35,36,37}: djangorestframework
py{34,35,36,37}: django-model-utils
py{34,35,36,37}: django-tables2
py{34,35,36,37}: factory-boy
py{34,35,36,37}: psycopg2
py{34,35,36,37}: pylint-plugin-utils
py{34,35,36,37}: pytest
setenv =
PIP_DISABLE_PIP_VERSION_CHECK = 1
PYTHONPATH = .
Expand Down

0 comments on commit ff3677f

Please sign in to comment.