From f2d9e3cee98c414c065b8101ae13336a00130412 Mon Sep 17 00:00:00 2001 From: Wayne Lambert Date: Sun, 9 Feb 2020 20:24:33 +0000 Subject: [PATCH 1/7] Update codebase for Django 3 and Python 3.8 --- tox.ini | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tox.ini b/tox.ini index fe9f40cf..3a61a2c1 100644 --- a/tox.ini +++ b/tox.ini @@ -10,6 +10,7 @@ envlist = readme py{36}-django{111,20,-master} py{35,36,37}-django22 + py{36,37,38}-django30 [testenv] commands = @@ -20,6 +21,7 @@ commands = readme: bash -c \'python setup.py -q sdist && twine check dist/*\' py{36}-django{111,20,-master}: coverage run pylint_django/tests/test_func.py -v py{35,36,37}-django22: coverage run pylint_django/tests/test_func.py -v + py{36,37,38}-django30: 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,6 +35,7 @@ deps = django20: Django>=2.0,<2.1 django21: Django>=2.1,<2.2 django22: Django>=2.2,<3.0 + django30: Django>=3.0,<3.1 django-master: Django django-master: git+https://github.com/pycqa/astroid@master django-master: git+https://github.com/pycqa/pylint@master @@ -44,6 +47,7 @@ whitelist_externals = readme: bash py{36}-django{111,20,-master}: coverage py{35,36,37}-django22: coverage + py{36,37,38}-django30: coverage clean: find clean: rm @@ -53,6 +57,7 @@ DJANGO = 2.0: django20 2.1: django21 2.2: django22 + 3.0: django30 master: django-master [flake8] From 96a1c5e29b717d514b3227d626e884770b18a760 Mon Sep 17 00:00:00 2001 From: Wayne Lambert Date: Sun, 9 Feb 2020 20:27:57 +0000 Subject: [PATCH 2/7] Update codebase for Django 3 and Python 3.8 --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index fbde565e..6b3fc192 100644 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ author_email='code@landscape.io', description='A Pylint plugin to help Pylint understand the Django web framework', long_description=LONG_DESCRIPTION, - version='2.0.13', + version='2.0.14', packages=find_packages(), include_package_data=True, install_requires=[ @@ -34,6 +34,7 @@ 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.8', ], keywords=['pylint', 'django', 'plugin'], zip_safe=False, From 001353006dbf3ec8dfb235509104ce719492057f Mon Sep 17 00:00:00 2001 From: Wayne Lambert Date: Sun, 9 Feb 2020 20:32:25 +0000 Subject: [PATCH 3/7] Update codebase for Django 3 and Python 3.8 --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 68328f4a..10b3cf34 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,9 +5,11 @@ python: - 3.6 - 3.7 - 3.7-dev + - 3.8 env: # note: latest versions first b/c the top-most is included in new # build stages if not specified + - DJANGO=3.0 - DJANGO=2.2 stages: - django_not_installed @@ -18,6 +20,7 @@ matrix: include: - { stage: django_not_installed, python: 3.6, env: TOXENV=django_not_installed } - { stage: django_is_installed, python: 3.6, env: TOXENV=django_is_installed } + - { stage: test, python: 3.6, env: DJANGO=3.0 } - { stage: test, python: 3.6, env: DJANGO=2.0 } - { stage: test, python: 3.6, env: DJANGO=1.11 } - { stage: test, python: 3.6, env: DJANGO=master } From 2dcc8e31c1b0bc4dbc796fec0a1f0576dc291410 Mon Sep 17 00:00:00 2001 From: Wayne Lambert Date: Sun, 9 Feb 2020 20:34:52 +0000 Subject: [PATCH 4/7] Update codebase for Django 3 and Python 3.8 --- CHANGELOG.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 1ed13d84..3657e138 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,12 @@ Changelog ========= +Version 2.0.14 (09 Feb 2020) +-------------------------------------------------- + +- Add support for Django 3.0 and Python 3.8 + + Version 2.0.13 (23 Nov 2019), HackBulgaria edition -------------------------------------------------- From dfe4672ec3700aa72a2a8d3aec15eed1a8c78a3d Mon Sep 17 00:00:00 2001 From: Wayne Lambert Date: Sun, 9 Feb 2020 20:39:56 +0000 Subject: [PATCH 5/7] Update Contributors.md Update to contributors following commits for updating to Django 3 and Python 3.8 --- CONTRIBUTORS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 6f1fc917..431bba00 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -13,3 +13,4 @@ * [fadedDexofan](https://github.com/fadeddexofan) * [imomaliev](https://github.com/imomaliev) * [psrb](https://github.com/psrb) +* [WayneLambert](https://github.com/WayneLambert) From 17748bad2c3497f7012a746a9c4625474e3f6c14 Mon Sep 17 00:00:00 2001 From: Wayne Lambert Date: Tue, 11 Feb 2020 12:19:16 +0000 Subject: [PATCH 6/7] Remove date Remote date as per request from @atodorov to make it clear it is still unreleased. --- CHANGELOG.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 3657e138..9d98da06 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,7 +1,7 @@ Changelog ========= -Version 2.0.14 (09 Feb 2020) +Version 2.0.14 -------------------------------------------------- - Add support for Django 3.0 and Python 3.8 From b567ae3cb4c3d275d113e1ed229513a58a818a40 Mon Sep 17 00:00:00 2001 From: Wayne Lambert Date: Tue, 11 Feb 2020 12:21:37 +0000 Subject: [PATCH 7/7] Remove 3.7 Dev --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 10b3cf34..6dd1f585 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,6 @@ python: - 3.5 - 3.6 - 3.7 - - 3.7-dev - 3.8 env: # note: latest versions first b/c the top-most is included in new