Support Django 4.2

.github/workflows/main.yml

@@ -25,7 +25,6 @@ jobs:
       max-parallel: 5
       matrix:
         python-version:
-          - "3.6"
           - "3.7"
           - "3.8"
           - "3.9"

.github/workflows/release.yaml

@@ -0,0 +1,11 @@
+name: Release
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  build-and-publish:
+    uses: less-action/reusables/.github/workflows/python-publish.yaml@v6
+    secrets:
+      pypi_api_token: ${{ secrets.PYPI_API_TOKEN }}

.pre-commit-config.yaml

@@ -2,7 +2,7 @@ default_language_version:
   python: python3.10
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.1.0
+    rev: "v4.3.0"
     hooks:
       - id: check-case-conflict
       - id: check-merge-conflict
@@ -11,51 +11,51 @@ repos:
       - id: debug-statements
       - id: detect-private-key
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.31.0
+    rev: "v2.37.3"
     hooks:
       - id: pyupgrade
         args:
-          - --py36-plus
+          - --py37-plus
   - repo: https://github.com/myint/autoflake
-    rev: v1.4
+    rev: "v1.5.1"
     hooks:
       - id: autoflake
         args:
           - --in-place
           - --remove-all-unused-imports
           - --ignore-init-module-imports
   - repo: https://github.com/pycqa/isort
-    rev: 5.10.1
+    rev: "5.12.0"
     hooks:
       - id: isort
   - repo: https://github.com/psf/black
-    rev: 22.3.0
+    rev: "22.6.0"
     hooks:
       - id: black
   - repo: https://github.com/asottile/blacken-docs
-    rev: v1.12.1
+    rev: "v1.12.1"
     hooks:
       - id: blacken-docs
-        additional_dependencies: [black==22.3.0]
-  - repo: https://gitlab.com/pycqa/flake8
-    rev: 3.9.2
+        additional_dependencies: ["black==22.6.0"]
+  - repo: https://github.com/pycqa/flake8
+    rev: "5.0.4"
     hooks:
       - id: flake8
         additional_dependencies:
           - flake8-bugbear
           - flake8-comprehensions
           - flake8-tidy-imports
+          - flake8-print
   - repo: https://github.com/sirosen/check-jsonschema
-    rev: 0.11.0
+    rev: "0.18.1"
     hooks:
       - id: check-github-workflows
-# - repo: https://github.com/mgedmin/check-manifest
-#   rev: "0.47"
-#   hooks:
-#     - id: check-manifest
-#       # See https://github.com/mgedmin/check-manifest/issues/141
-#       args: ["--no-build-isolation"]
-# Unsure how to solve this failing
+  - repo: https://github.com/mgedmin/check-manifest
+    rev: "0.48"
+    hooks:
+      - id: check-manifest
+        # See https://github.com/mgedmin/check-manifest/issues/141
+        args: ["--no-build-isolation"]
 
 exclude: |
   (?x)(

MANIFEST.in

@@ -1,6 +1,13 @@
 include setup.py README.md MANIFEST.in LICENSE AUTHORS
+exclude runtests.py tox.ini *.yml *.yaml Makefile Dockerfile .dockerignore .gitmodules
 
 recursive-include djedi/templates *
 recursive-include djedi/static *
+recursive-include djedi *.py
+recursive-exclude djedi *.html
+recursive-exclude djedi *.png
+recursive-exclude djedi-react *
+recursive-exclude docs *
+recursive-exclude example *
 
 global-exclude *~

djedi/__init__.py

@@ -1,4 +1,4 @@
-VERSION = (1, 3, 3, "final", 0)
+VERSION = (1, 4, 0, "final", 0)
 
 
 def get_version(version=None):

setup.py

@@ -58,7 +58,6 @@
         "Operating System :: OS Independent",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",

tox.ini

@@ -4,33 +4,30 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py36-django{ 22, 30, 31, 32 },
-          py37-django{ 22, 30, 31, 32 },
-          py38-django{ 22, 30, 31, 32, 40, 41 },
-          py39-django{ 22, 30, 31, 32, 40, 41 },
-          py310-django{ 22, 30, 31, 32, 40, 41 }
+envlist = py37-django{  32 },
+          py38-django{  32, 40, 41, 42 },
+          py39-django{  32, 40, 41, 42 },
+          py310-django{ 32, 40, 41, 42 }
 
 
 [testenv]
 passenv = COVERAGE_FILE
-whitelist_externals = make
+allowlist_externals = make
 commands = make test
 install_command = pip install --pre {opts} {packages}
 deps = six
        Pillow
        markdown<=3.3
        django-discover-runner
        coverage
-       django22: Django>=2.2,<2.3
-       django30: Django>=3.0,<3.1
-       django31: Django>=3.1,<3.2
        django32: Django>=3.2,<3.3
        django40: Django>=4.0,<4.1
        django41: Django>=4.1,<4.2
+       django42: Django>=4.2,<4.3
 
 [testenv:lcov]
 passenv = COVERAGE_FILE
-whitelist_externals = make
+allowlist_externals = make
 commands = make coverage-lcov
 install_command = pip install --pre {opts} {packages}
 deps = coverage