Merge branch 'master' of github.com:django-cms/django-filer

Author: jrief

.github/workflows/docs.yml

@@ -8,11 +8,11 @@ jobs:
     name: docs
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v5
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
-          python-version: 3.9
+          python-version: 3.12
       - run: python -m pip install -r docs/requirements.txt
       - name: Build docs
         run: |

.github/workflows/frontend.yml

@@ -1,18 +1,18 @@
-name: gulp
+name: Frontend CI
 
 on: [push]
 
 jobs:
   gulp:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [16.20.x]
+        node-version: [18.19.x]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v5
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v4
       with:
         node-version: ${{ matrix.node-version }}
     - run: python -m pip install -r tests/requirements/frontend.txt

.github/workflows/lint.yml

@@ -14,7 +14,7 @@ jobs:
         with:
           python-version: 3.9
       - name: Install flake8
-        run: pip install --upgrade flake8
+        run: pip install --upgrade flake8 flake8-pyproject
       - name: Run flake8
         uses: liskin/gh-problem-matcher-wrap@v1
         with:

.github/workflows/test.yml

@@ -8,30 +8,31 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.8, 3.9, '3.10', '3.11', '3.12']
+        python-version: [3.9, '3.10', '3.11', '3.12', '3.13']
         requirements-file: [
           django-4.2.txt,
           django-5.0.txt,
           django-5.1.txt,
+          django-5.2.txt,
           django-main.txt,
         ]
         custom-image-model: [false, true]
         os: [
-          ubuntu-20.04,
+          ubuntu-latest,
         ]
         exclude:
-          - requirements-file: django-5.0.txt
-            python-version: 3.8
           - requirements-file: django-5.0.txt
             python-version: 3.9
-          - requirements-file: django-5.1.txt
-            python-version: 3.8
           - requirements-file: django-5.1.txt
             python-version: 3.9
-          - requirements-file: django-main.txt
-            python-version: 3.8
+          - requirements-file: django-5.2.txt
+            python-version: 3.9
           - requirements-file: django-main.txt
             python-version: 3.9
+          - requirements-file: django-main.txt
+            python-version: 3.10
+          - requirements-file: django-main.txt
+            python-version: 3.11
 
     steps:
     - uses: actions/checkout@v1
@@ -40,7 +41,7 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
     - name: library prerequisites
-      run: sudo apt-get install python-dev libpq-dev libmagic1 gcc libxml2-dev libxslt1-dev libjpeg62 libopenjp2-7 -y
+      run: sudo apt-get install python-dev-is-python3 libpq-dev libmagic1 gcc libxml2-dev libxslt1-dev libjpeg62 libopenjp2-7 -y
     - name: Install extra dependencies
       run: pip install lxml
       if: matrix.python-version == '3.10'

.nvmrc

@@ -0,0 +1 @@
+18

.pre-commit-config.yaml

@@ -21,10 +21,11 @@ repos:
 #        args: [--target-version, "2.2"]
 
   - repo: https://github.com/PyCQA/flake8
-    rev: 7.1.1
+    rev: 7.0.0
     hooks:
       - id: flake8
-
+        entry: pflake8
+        additional_dependencies: [pyproject-flake8]
   - repo: https://github.com/asottile/yesqa
     rev: v1.5.0
     hooks:

docs/conf.py

@@ -15,7 +15,7 @@
 import sys
 
 
-sys.path.append(os.path.abspath('../'))
+sys.path.append(os.path.abspath("../"))
 
 from filer import __version__  # NOQA
 
@@ -33,38 +33,38 @@
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = [
-    'sphinx.ext.autodoc',
-    'sphinx.ext.doctest',
-    'sphinx.ext.intersphinx',
-    'sphinx.ext.todo',
-    'sphinxcontrib.spelling',
+    "sphinx.ext.autodoc",
+    "sphinx.ext.doctest",
+    "sphinx.ext.intersphinx",
+    "sphinx.ext.todo",
+    "sphinxcontrib.spelling",
     "sphinx_copybutton",
     "sphinxext.opengraph",
-    'sphinxcontrib.images',
+    "sphinxcontrib.images",
 ]
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
+templates_path = ["_templates"]
 
 # The suffix of source filenames.
-source_suffix = '.rst'
+source_suffix = ".rst"
 
 # The encoding of source files.
 # source_encoding = 'utf-8-sig'
 
 # The master toctree document.
-master_doc = 'index'
+master_doc = "index"
 
 # General information about the project.
-project = 'django-filer'
-copyright = '%s, Stefan Foulis' % (datetime.date.today().year,)
+project = "django-filer"
+copyright = "%s, Stefan Foulis" % (datetime.date.today().year,)
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '.'.join(__version__.split('.')[0:2])
+version = ".".join(__version__.split(".")[:2])
 # The full version, including alpha/beta/rc tags.
 release = __version__
 
@@ -80,7 +80,7 @@
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns = ['_build', '_images', 'README.rst']
+exclude_patterns = ["_build", "_images", "README.rst"]
 
 # The reST default role (used for this markup: `text`) to use for all documents.
 # default_role = None
@@ -97,7 +97,7 @@
 # show_authors = False
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = "sphinx"
 
 # A list of ignored prefixes for module index sorting.
 # modindex_common_prefix = []
@@ -107,7 +107,7 @@
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = 'furo'
+html_theme = "furo"
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
@@ -138,7 +138,7 @@
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+html_static_path = ["_static"]
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
@@ -182,7 +182,7 @@
 # html_file_suffix = ''
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'django-filerdoc'
+htmlhelp_basename = "django-filerdoc"
 
 
 # -- Options for LaTeX output --------------------------------------------------
@@ -196,7 +196,13 @@
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-    ('index', 'django-filer.tex', 'django-filer Documentation', 'Stefan Foulis', 'manual'),
+    (
+        "index",
+        "django-filer.tex",
+        "django-filer Documentation",
+        "Stefan Foulis",
+        "manual",
+    ),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -228,13 +234,19 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'django-filer', 'django-filer Documentation', ['Stefan Foulis'], 1)
+    ("index", "django-filer", "django-filer Documentation", ["Stefan Foulis"], 1)
 ]
 
 
 # Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {'http://docs.python.org/': None}
+intersphinx_mapping = {
+    "python": ("https://docs.python.org/3", None),
+    "django": (
+        "https://docs.djangoproject.com/en/stable/",
+        "https://docs.djangoproject.com/en/stable/objects.inv",
+    ),
+}
 
 images_config = {
-    'override_image_directive': True,
+    "override_image_directive": True,
 }

docs/requirements.in

@@ -0,0 +1,11 @@
+django>=4.2,<5
+furo
+restructuredtext-lint
+sphinx<8
+sphinx-autobuild
+sphinx-copybutton
+sphinxcontrib-images
+sphinxcontrib-spelling
+sphinxcontrib-inlinesyntaxhighlight
+sphinxext-opengraph
+pip-tools