From ff3677f0389043a3d31ac899be228c2c332f14a4 Mon Sep 17 00:00:00 2001 From: "Mr. Senko" Date: Mon, 16 Jul 2018 00:40:41 +0300 Subject: [PATCH] Require pylint >= 2.0. Fix #173 also drop testing with Python 2.7 b/c pylint 2.0 is compatible only with Python 3 --- .travis.yml | 3 --- CHANGELOG.rst | 3 +++ setup.py | 2 +- tox.ini | 21 ++++++++++----------- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 87a4cc64..4a2c4df8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ language: python python: - - 2.7 - 3.4 - 3.5 - 3.6 @@ -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 } @@ -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 diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 713475f3..a63e1022 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -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 --------------------------------------------------------------- diff --git a/setup.py b/setup.py index d5ab0722..8f9125d6 100644 --- a/setup.py +++ b/setup.py @@ -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'], diff --git a/tox.ini b/tox.ini index ffbe3985..f3c49427 100644 --- a/tox.ini +++ b/tox.ini @@ -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] @@ -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/ @@ -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 = .