From 3effc94e0bebc01841f27176ee33be42756a65b9 Mon Sep 17 00:00:00 2001
From: Josh Yu <joshyu@foxmail.com>
Date: Wed, 27 Mar 2024 15:30:35 +0800
Subject: [PATCH] update setup files

---
 .github/workflows/test.yml |  7 +------
 setup.cfg                  | 24 ++++++++++++++++++++++++
 tox.ini                    |  9 +++------
 3 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 8bc4fe0..b237720 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -11,13 +11,8 @@ jobs:
       matrix:
         python-version: ["3.11", "3.10", "3.9"]
         django: [42, 41, 32]
-        cms: [311, 39]
+        cms: [40]
         continue-on-error: [true]
-        exclude:
-          - django: 41
-            cms: 39
-          - django: 42
-            cms: 39
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
diff --git a/setup.cfg b/setup.cfg
index 9a1cd59..7f247c9 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -46,3 +46,27 @@ formats = zip
 
 [bdist_wheel]
 universal = 1
+
+
+[flake8]
+max-line-length = 120
+exclude =
+    .git,
+    __pycache__,
+    **/migrations/,
+    build/,
+    .tox/,
+
+[isort]
+line_length = 79
+multi_line_output = 3
+lines_after_imports = 2
+combine_as_imports = true
+include_trailing_comma = true
+balanced_wrapping = true
+skip = manage.py, migrations, .tox
+extra_standard_library = mock
+known_django = django
+known_cms = cms, menus
+known_first_party = djangocms_version_locking
+sections = FUTURE, STDLIB, DJANGO, CMS, THIRDPARTY, FIRSTPARTY, LOCALFOLDER
\ No newline at end of file
diff --git a/tox.ini b/tox.ini
index c1a9802..2f98c2c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,20 +8,17 @@ envlist =
     ruff
     pypi-description
     towncrier
-    py{311,310,39}-django{42,41}-cms{311}
-    py{311,310,39}-django{32}-cms{311,39}
+    py{311,310,39}-django{32,42}-cms{40}
 minversion = 3.22
 
 [testenv]
 commands = {env:COMMAND:python} cms_helper.py djangocms_multisite test {posargs}
 deps =
     django32: Django~=3.2.0
-    django41: Django~=4.1.0
     django42: Django~=4.2.0
-    cms39: https://github.com/django-cms/django-cms/archive/release/3.9.x.zip
-    cms311: https://github.com/yakky/django-cms/archive/release/3.11.x.zip
+    cms40: https://github.com/django-cms/django-cms/archive/release/4.0.1.x.tar.gz
     djangocms-text-ckeditor>=4
-    https://github.com/protoroto/django-multisite/archive/refs/heads/feature/add-django4-support.zip
+    https://github.com/FidelityInternational/django-multisite/archive/feat/django-42-compat.tar.gz
     -r{toxinidir}/requirements-test.txt
 passenv =
     COMMAND