Converting to poetry-based packaging, and dropping python 3.6 support

Author: Carl Crowder

.github/workflows/build.yml

@@ -38,7 +38,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.8, 3.9]
+        python-version: [3.8, 3.9, "3.10", "3.11"]
         django-version: [-main, "4.0"]
 
     steps:
@@ -72,8 +72,8 @@ jobs:
     strategy:  # TODO: use a YAML anchor - not supported in GitHub actions "yet"
       fail-fast: false
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
-        django-version: [3.2, 3.1, "3.0", "2.0", 1.11]
+        python-version: [3.7, 3.8, 3.9]
+        django-version: [3.2, 3.1, "3.0", "2.0", "2.2", "1.11"]
 
     steps:
       - uses: actions/checkout@v2
@@ -104,7 +104,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.6]
+        python-version: [3.7]
 
     steps:
       - uses: actions/checkout@v2

.pre-commit-config.yaml

@@ -15,7 +15,7 @@ repos:
       - id: flake8
         args: [ --max-line-length=120 ]
   - repo: https://github.com/psf/black
-    rev: 22.12.0
+    rev: 23.3.0
     hooks:
       - id: black
         args: [--safe, --line-length=120]

CHANGELOG.rst

@@ -4,6 +4,13 @@ Changelog
 Version 2.6.0 (14 May 2023)
 ---------------------------
 
+NOTICE
+~~~~~~
+
+This version drops support for Python 3.6
+
+Bugfixes
+~~~~~~~~
 
 
 

MANIFEST.in

@@ -1,7 +1,7 @@
 """
 Ensures that django models without a __unicode__ method are flagged
 """
-#  pylint: disable=missing-docstring,wrong-import-position,unnecessary-lambda-assignment
+#  pylint: disable=missing-docstring,wrong-import-position
 
 from django.db import models
 

poetry.lock

@@ -1,27 +1,22 @@
 [tool.poetry]
 name = "pylint-django"
-version = "2.5.3"
+version = "2.6.0a0"
 readme = "README.rst"
 description = "A Pylint plugin to help Pylint understand the Django web framework"
 repository = "https://github.com/PyCQA/pylint-django"
 authors = ["Carl Crowder <[email protected]>"]
-license="GPLv2"
 classifiers=[
     "Development Status :: 5 - Production/Stable",
     "Environment :: Console",
     "Intended Audience :: Developers",
     "Operating System :: Unix",
     "Topic :: Software Development :: Quality Assurance",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.6",
     "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
-    "Framework :: Django :: 1.11",
-    "Framework :: Django :: 2.0",
-    "Framework :: Django :: 2.1",
     "Framework :: Django :: 2.2",
     "Framework :: Django :: 3",
     "Framework :: Django :: 3.0",
@@ -46,32 +41,31 @@ exclude = ["**/tests/**", "**/testutils.py", "**/tests.py"]
 
 [tool.poetry.dependencies]
 python = ">=3.7,<4.0"
-pylint-plugin-utils = ">=0.7"
+pylint-plugin-utils = ">=0.8"
 pylint = ">=2.0,<3"
+Django = {version=">=2.2", optional = true}
 
 [tool.poetry.group.dev.dependencies]
+tox = "^4.5.1"
+pytest = "^7.3.1"
 pylint = ">=2.13"
-django-tables2 = "^2.5.3"
-factory-boy = "^3.2.1"
 coverage = "^7.2.5"
-pytest = "^7.3.1"
+twine = "^4.0.2"
 wheel = "^0.40.0"
-django-tastypie = "^0.14.5"
+django-tables2 = {version="^2.5.3", optional = true}
+factory-boy = {version="^3.2.1", optional = true}
+django-tastypie = {version="^0.14.5", optional = true}
 
 [tool.poetry.extras]
 with_django = ["Django"]
+for_tests = ['django-tastypie', 'django-tables2', 'factory-boy']
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.black]
 line-length = 120
-exclude = '''
-/(
-    tests/
-)/
-'''
 
 [tool.isort]
 multi_line_output = 3

pylint_django/tests/input/func_noerror_model_unicode_lambda.py

@@ -19,8 +19,7 @@ tox -e readme
 # then build the packages
 echo "..... Building PyPI packages"
 set -e
-python setup.py sdist >/dev/null
-python setup.py bdist_wheel >/dev/null
+poetry build --quiet
 set +e
 
 # then run some sanity tests
@@ -40,7 +39,7 @@ echo "..... Trying to verify that all source files are present"
 # remove pylint_django/*.egg-info/ generated during build
 find . -type d -name '*.egg-info' | xargs rm -rf
 
-source_files=`find ./pylint_django/ -type f | sed 's|./||'`
+source_files=`find ./pylint_django/ -type f ! -path '**/tests/**' | sed 's|./||'`
 
 # verify for .tar.gz package
 package_files=`tar -tvf dist/*.tar.gz`
@@ -77,7 +76,6 @@ rm -rf .venv/
 echo "..... Trying to install the new wheel inside a virtualenv"
 virtualenv .venv/test-wheel
 source .venv/test-wheel/bin/activate
-pip install pylint-plugin-utils  # because it does not provide a wheel package
 pip install --only-binary :all: -f dist/ pylint_django
 deactivate
 rm -rf .venv/

pyproject.toml

@@ -8,9 +8,8 @@ envlist =
     flake8
     pylint
     readme
-    py{36}-django{111,20,-master}
-    py{36,37,38,39}-django{22,30,31,32}
-    py{38,39}-django40
+    py{37,38,39}-django{22,30,31,32}
+    py{38,39,310,311}-django{40,41,42}
 
 requires =
     pip >=21.0.1
@@ -22,9 +21,8 @@ commands =
     django_is_installed: pylint --rcfile=tox.ini --load-plugins=pylint_django --disable=E5110 setup.py
     flake8: flake8
     pylint: pylint --rcfile=tox.ini -d missing-docstring,too-many-branches,too-many-return-statements,too-many-ancestors,fixme --ignore=tests pylint_django setup
-    readme: bash -c "python setup.py -q sdist && twine check dist/*"
-    py{36}-django{111,20,-main}: coverage run pylint_django/tests/test_func.py -v
-    py{36,37,38,39}-django{22,30,31,32}: coverage run pylint_django/tests/test_func.py -v
+    readme: bash -c "poetry build && twine check dist/*"
+    py{37,38,39,310,311}-django{22,30,31,32,40,41,42}: 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/
@@ -35,14 +33,13 @@ deps =
     pylint: Django
     readme: twine
     readme: wheel
-    django111: Django>=1.11,<2.0
-    django20: Django>=2.0,<2.1
-    django21: Django>=2.1,<2.2
     django22: Django>=2.2,<3.0
     django30: Django>=3.0,<3.1
     django31: Django>=3.1,<3.2
     django32: Django>=3.2,<4.0
     django40: Django>=4.0,<4.1
+    django41: Django>=4.1,<4.2
+    django42: Django>=4.2,<4.3
     django-main: Django
     django-main: git+https://github.com/pycqa/astroid@main
     django-main: git+https://github.com/pycqa/pylint@main
@@ -52,8 +49,7 @@ setenv =
 allowlist_externals =
     django_not_installed: bash
     readme: bash
-    py{36}-django{111,20,-main}: coverage
-    py{36,37,38,39}-django{22,30,31,32,40}: coverage
+    py{37,38,39,310,311}-django{22,30,31,32,40,41,42}: coverage
     clean: find
     clean: rm