Bugfix/715 merge (nephila#719)

* Fix pre-commit flake8 repo url And autoupdate module to their latest versions, unless flake8 (5.0.4) because flake8-broken-line is not compatible with flake8 6.0.0 * Reformat for black update * Remove python 3.6 from test matrix * Fix langyage * Skip towncrier in precommit-ci --------- Co-authored-by: Adrien Delhorme <[email protected]>
fsbraun · Feb 11, 2023 · 6a3224e · 6a3224e
1 parent 72961c9
commit 6a3224e
Show file tree

Hide file tree

Showing 54 changed files with 30 additions and 74 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.9, 3.8, 3.7, 3.6]
+        python-version: [3.9, 3.8, 3.7]
         django: [31, 30, 22]
         cms: [38, 37]
         exclude:

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -3,7 +3,7 @@
 exclude: "(.idea|node_modules|.tox)"
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.3.0
+    rev: v4.4.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
@@ -17,15 +17,15 @@ repos:
         args:
           - --remove
   - repo: https://github.com/timothycrosley/isort
-    rev: "5.6.4"
+    rev: "5.12.0"
     hooks:
       - id: isort
   - repo: https://github.com/psf/black
-    rev: 20.8b1
+    rev: 23.1.0
     hooks:
       - id: black
-  - repo: https://gitlab.com/pycqa/flake8
-    rev: 3.8.4
+  - repo: https://github.com/PyCQA/flake8
+    rev: 5.0.4
     hooks:
       - id: flake8
         additional_dependencies:
@@ -40,14 +40,14 @@ repos:
           - flake8-tidy-imports
           - pep8-naming
   - repo: https://github.com/econchick/interrogate
-    rev: 1.3.1
+    rev: 1.5.0
     hooks:
       - id: interrogate
         args:
           - "-cpyproject.toml"
           - "--quiet"
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.7.3
+    rev: v3.3.1
     hooks:
       - id: pyupgrade
         args:
@@ -60,3 +60,7 @@ repos:
         language: system
         pass_filenames: false
         always_run: true
+
+ci:
+  skip:
+    - towncrier
diff --git a/changes/715.bugfix b/changes/715.bugfix
@@ -0,0 +1 @@
+Fix pre-commit flake8 repo url
diff --git a/djangocms_blog/feeds.py b/djangocms_blog/feeds.py
@@ -1,4 +1,5 @@
 from html import unescape
+from io import BytesIO
 
 from aldryn_apphooks_config.utils import get_app_instance
 from django.contrib.sites.models import Site
@@ -12,7 +13,6 @@
 from django.utils.text import normalize_newlines
 from django.utils.translation import get_language_from_request, gettext as _
 from lxml import etree
-from six import BytesIO
 
 from djangocms_blog.settings import get_setting
 from djangocms_blog.views import PostDetailView

diff --git a/djangocms_blog/liveblog/migrations/0001_initial.py b/djangocms_blog/liveblog/migrations/0001_initial.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("cms", "0013_urlconfrevision"),
         ("filer", "0003_thumbnailoption"),

diff --git a/djangocms_blog/liveblog/migrations/0002_liveblog_title.py b/djangocms_blog/liveblog/migrations/0002_liveblog_title.py
@@ -2,7 +2,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("liveblog", "0001_initial"),
     ]

diff --git a/djangocms_blog/liveblog/migrations/0003_auto_20160917_0123.py b/djangocms_blog/liveblog/migrations/0003_auto_20160917_0123.py
@@ -6,7 +6,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("liveblog", "0002_liveblog_title"),
     ]

diff --git a/djangocms_blog/migrations/0001_initial.py b/djangocms_blog/migrations/0001_initial.py
@@ -14,7 +14,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
         migrations.swappable_dependency(ACTUAL_FILER_IMAGE_MODEL),

diff --git a/djangocms_blog/migrations/0002_post_sites.py b/djangocms_blog/migrations/0002_post_sites.py
@@ -2,7 +2,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("sites", "__first__"),
         ("djangocms_blog", "0001_initial"),

diff --git a/djangocms_blog/migrations/0003_auto_20141201_2252.py b/djangocms_blog/migrations/0003_auto_20141201_2252.py
@@ -2,7 +2,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("djangocms_blog", "0002_post_sites"),
     ]

diff --git a/djangocms_blog/migrations/0004_auto_20150108_1435.py b/djangocms_blog/migrations/0004_auto_20150108_1435.py
@@ -9,7 +9,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         migrations.swappable_dependency(ACTUAL_FILER_IMAGE_MODEL),
         ("djangocms_blog", "0003_auto_20141201_2252"),

diff --git a/djangocms_blog/migrations/0005_auto_20150212_1118.py b/djangocms_blog/migrations/0005_auto_20150212_1118.py
@@ -3,7 +3,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("djangocms_blog", "0004_auto_20150108_1435"),
     ]

diff --git a/djangocms_blog/migrations/0006_auto_20150214_1907.py b/djangocms_blog/migrations/0006_auto_20150214_1907.py
@@ -3,7 +3,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("djangocms_blog", "0005_auto_20150212_1118"),
     ]

diff --git a/djangocms_blog/migrations/0007_auto_20150719_0933.py b/djangocms_blog/migrations/0007_auto_20150719_0933.py
@@ -12,7 +12,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("djangocms_blog", "0006_auto_20150214_1907"),
         migrations.swappable_dependency(ACTUAL_FILER_IMAGE_MODEL),

diff --git a/djangocms_blog/migrations/0008_auto_20150814_0831.py b/djangocms_blog/migrations/0008_auto_20150814_0831.py
@@ -3,7 +3,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("djangocms_blog", "0007_auto_20150719_0933"),
     ]

diff --git a/djangocms_blog/migrations/0009_latestpostsplugin_tags_new.py b/djangocms_blog/migrations/0009_latestpostsplugin_tags_new.py
@@ -28,7 +28,6 @@ def migrate_tags_reverse(apps, schema_editor):
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("taggit", "__first__"),
         ("djangocms_blog", "0008_auto_20150814_0831"),

diff --git a/djangocms_blog/migrations/0010_auto_20150923_1151.py b/djangocms_blog/migrations/0010_auto_20150923_1151.py
@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("cms", "__first__"),
         ("djangocms_blog", "0009_latestpostsplugin_tags_new"),

diff --git a/djangocms_blog/migrations/0011_auto_20151024_1809.py b/djangocms_blog/migrations/0011_auto_20151024_1809.py
@@ -6,7 +6,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("djangocms_blog", "0010_auto_20150923_1151"),
     ]

diff --git a/djangocms_blog/migrations/0012_auto_20151220_1734.py b/djangocms_blog/migrations/0012_auto_20151220_1734.py
@@ -2,7 +2,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("djangocms_blog", "0011_auto_20151024_1809"),
     ]

diff --git a/djangocms_blog/migrations/0013_auto_20160201_2235.py b/djangocms_blog/migrations/0013_auto_20160201_2235.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("djangocms_blog", "0012_auto_20151220_1734"),
     ]

diff --git a/djangocms_blog/migrations/0014_auto_20160215_1331.py b/djangocms_blog/migrations/0014_auto_20160215_1331.py
@@ -33,7 +33,6 @@ def backwards(apps, schema_editor):
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("cms", "0004_auto_20140924_1038"),
         ("djangocms_blog", "0013_auto_20160201_2235"),

diff --git a/djangocms_blog/migrations/0015_auto_20160408_1849.py b/djangocms_blog/migrations/0015_auto_20160408_1849.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("djangocms_blog", "0014_auto_20160215_1331"),
     ]

diff --git a/djangocms_blog/migrations/0016_auto_20160502_1741.py b/djangocms_blog/migrations/0016_auto_20160502_1741.py
@@ -2,7 +2,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("djangocms_blog", "0015_auto_20160408_1849"),
     ]

diff --git a/djangocms_blog/migrations/0017_thumbnail_move.py b/djangocms_blog/migrations/0017_thumbnail_move.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("filer", "0003_thumbnailoption"),
         ("djangocms_blog", "0016_auto_20160502_1741"),

diff --git a/djangocms_blog/migrations/0018_thumbnail_move2.py b/djangocms_blog/migrations/0018_thumbnail_move2.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     if "cmsplugin_filer" not in thumbnail_model:
         dependencies = [
             ("djangocms_blog", "0017_thumbnail_move"),

diff --git a/djangocms_blog/migrations/0020_thumbnail_move4.py b/djangocms_blog/migrations/0020_thumbnail_move4.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     if "cmsplugin_filer" not in thumbnail_model:
         dependencies = [
             ("djangocms_blog", "0019_thumbnail_move3"),

diff --git a/djangocms_blog/migrations/0021_auto_20160823_2008.py b/djangocms_blog/migrations/0021_auto_20160823_2008.py
@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("djangocms_blog", "0020_thumbnail_move4"),
     ]

diff --git a/djangocms_blog/migrations/0021_post_liveblog.py b/djangocms_blog/migrations/0021_post_liveblog.py
@@ -3,7 +3,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("cms", "__first__"),
         ("djangocms_blog", "0020_thumbnail_move4"),

diff --git a/djangocms_blog/migrations/0022_auto_20160605_2305.py b/djangocms_blog/migrations/0022_auto_20160605_2305.py
@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("djangocms_blog", "0021_post_liveblog"),
     ]

diff --git a/djangocms_blog/migrations/0023_auto_20160626_1539.py b/djangocms_blog/migrations/0023_auto_20160626_1539.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("djangocms_blog", "0022_auto_20160605_2305"),
     ]

diff --git a/djangocms_blog/migrations/0024_auto_20160706_1524.py b/djangocms_blog/migrations/0024_auto_20160706_1524.py
@@ -6,7 +6,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("djangocms_blog", "0023_auto_20160626_1539"),
     ]

diff --git a/djangocms_blog/migrations/0025_auto_20160803_0858.py b/djangocms_blog/migrations/0025_auto_20160803_0858.py
@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("djangocms_blog", "0024_auto_20160706_1524"),
     ]

diff --git a/djangocms_blog/migrations/0026_merge.py b/djangocms_blog/migrations/0026_merge.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("djangocms_blog", "0021_auto_20160823_2008"),
         ("djangocms_blog", "0025_auto_20160803_0858"),

diff --git a/djangocms_blog/migrations/0027_post_date_featured.py b/djangocms_blog/migrations/0027_post_date_featured.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("djangocms_blog", "0026_merge"),
     ]

diff --git a/djangocms_blog/migrations/0029_post_related.py b/djangocms_blog/migrations/0029_post_related.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("djangocms_blog", "0028_auto_20170304_1040"),
     ]

diff --git a/djangocms_blog/migrations/0030_auto_20170509_1831.py b/djangocms_blog/migrations/0030_auto_20170509_1831.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("djangocms_blog", "0029_post_related"),
     ]

diff --git a/djangocms_blog/migrations/0031_auto_20170610_1744.py b/djangocms_blog/migrations/0031_auto_20170610_1744.py
@@ -6,7 +6,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("djangocms_blog", "0030_auto_20170509_1831"),
     ]

diff --git a/djangocms_blog/migrations/0032_auto_20180109_0023.py b/djangocms_blog/migrations/0032_auto_20180109_0023.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("djangocms_blog", "0031_auto_20170610_1744"),
     ]

diff --git a/djangocms_blog/migrations/0033_auto_20180226_1410.py b/djangocms_blog/migrations/0033_auto_20180226_1410.py
@@ -2,7 +2,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("djangocms_blog", "0032_auto_20180109_0023"),
     ]

diff --git a/djangocms_blog/migrations/0034_merge.py b/djangocms_blog/migrations/0034_merge.py
@@ -2,7 +2,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("djangocms_blog", "0022_auto_20170304_1040"),
         ("djangocms_blog", "0033_auto_20180226_1410"),

diff --git a/djangocms_blog/migrations/0035_posttranslation_subtitle.py b/djangocms_blog/migrations/0035_posttranslation_subtitle.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("djangocms_blog", "0034_merge"),
     ]

diff --git a/djangocms_blog/migrations/0036_auto_20180913_1809.py b/djangocms_blog/migrations/0036_auto_20180913_1809.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("djangocms_blog", "0035_posttranslation_subtitle"),
     ]

diff --git a/djangocms_blog/migrations/0037_auto_20190806_0743.py b/djangocms_blog/migrations/0037_auto_20190806_0743.py
@@ -8,7 +8,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("djangocms_blog", "0036_auto_20180913_1809"),
     ]

diff --git a/djangocms_blog/migrations/0038_post_media.py b/djangocms_blog/migrations/0038_post_media.py
@@ -6,7 +6,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("cms", "0020_old_tree_cleanup"),
         ("djangocms_blog", "0037_auto_20190806_0743"),
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,6 @@ @@
     class Migration(migrations.Migration):
         dependencies = [
             ("liveblog", "0001_initial"),
         ]
@@ Expand Down @@