Merge branch 'master' into dependabot/npm_and_yarn/fsevents-1.2.13

django-cms · Nov 25, 2024 · 4faa2b2 · 4faa2b2
2 parents 5a3c083 + 4d3c25d
commit 4faa2b2
Show file tree

Hide file tree

Showing 82 changed files with 1,667 additions and 567 deletions.
diff --git a/.github/ISSUE_TEMPLATE/---bug-report.md b/.github/ISSUE_TEMPLATE/---bug-report.md
@@ -0,0 +1,65 @@
+---
+name: "\U0001F41E Bug report"
+about: Something isn't working as expected? Here is the right place to report.
+title: "[BUG]"
+labels: ''
+assignees: ''
+
+---
+
+<!--
+Please fill in each section below, otherwise, your issue will be closed.
+This info allows django CMS maintainers to diagnose (and fix!) your issue
+as quickly as possible.
+-->
+
+## Description
+
+<!--
+If this is a security issue stop immediately and follow the instructions at:
+http://docs.django-cms.org/en/latest/contributing/development-policies.html#reporting-security-issues
+-->
+
+## Steps to reproduce
+
+<!--
+Clear steps describing how to reproduce the issue.
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+-->
+
+## Expected behaviour
+
+<!--
+A clear and concise description of what you expected to happen.
+-->
+
+## Actual behaviour
+
+<!--
+A clear and concise description of what is actually happening.
+-->
+
+## Screenshots
+
+<!--If applicable, add screenshots to help explain your problem.
+-->
+
+## Additional information (CMS/Python/Django versions)
+
+<!--
+Add any other context about the problem such as environment,
+CMS/Python/Django versions, logs etc. here.
+-->
+
+## Do you want to help fix this issue?
+
+<!--
+The django CMS project is managed and kept alive by its open source community and is backed by the [django CMS Association](https://www.django-cms.org/en/about-us/). We therefore welcome any help and are grateful if people contribute to the project. Please use 'x' to check the items below.
+-->
+
+* [ ] Yes, I want to help fix this issue and I will join #workgroup-pr-review on [Slack](https://www.django-cms.org/slack) to confirm with the community that a PR is welcome.
+* [ ] No, I only want to report the issue.
diff --git a/.github/ISSUE_TEMPLATE/---documentation-report.md b/.github/ISSUE_TEMPLATE/---documentation-report.md
@@ -0,0 +1,43 @@
+---
+name: "\U0001F4D8 Documentation report"
+about: "Something isn't described correctly in the documentation or needs to be updated?
+  Here is the right place to report."
+title: "[DOC]"
+labels: 'component: documentation'
+assignees: ''
+
+---
+
+<!--
+Please fill in each section below, otherwise, your issue will be closed.
+This info allows django CMS maintainers to diagnose (and fix!) your issue
+as quickly as possible.
+-->
+
+## Description
+
+<!--
+If this is a security issue stop immediately and follow the instructions at:
+http://docs.django-cms.org/en/latest/contributing/development-policies.html#reporting-security-issues
+-->
+
+## Screenshots
+
+<!--If applicable, add screenshots to help explain your problem.
+-->
+
+## Additional information (CMS/Python/Django versions)
+
+<!--
+Add any other context about the problem such as environment,
+CMS/Python/Django versions, logs etc. here.
+-->
+
+## Do you want to help fix this documentation issue?
+
+<!--
+The django CMS project is managed and kept alive by its open source community and is backed by the [django CMS Association](https://www.django-cms.org/en/about-us/). We therefore welcome any help and are grateful if people contribute to the project. Please use 'x' to check the items below.
+-->
+
+* [ ] Yes, I want to help fix this issue and I will join #workgroup-documentation on [Slack](https://www.django-cms.org/slack) to confirm with the team that a PR is welcome.
+* [ ] No, I only want to report the issue.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,28 @@
+## Description
+
+<!--
+If this is a security issue stop right here and follow our documentation:
+http://docs.django-cms.org/en/latest/contributing/development-policies.html#reporting-security-issues
+-->
+
+## Related resources
+
+<!--
+Add here links to existing issues or conversation from GitHub
+or any other resource.
+-->
+
+* #...
+* #...
+
+## Checklist
+
+<!--
+Please check the following items before submitting, otherwise,
+your pull request will be closed.
+Use 'x' to check each item: [x] I have ...
+-->
+
+* [ ] I have added or modified the tests when changing logic
+* [ ] I have followed [the conventional commits guidelines](https://www.conventionalcommits.org/) to add meaningful information into the changelog
+* [ ] I have read the [contribution guidelines ](https://github.com/django-cms/django-cms/blob/develop/CONTRIBUTING.rst)
diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml
@@ -10,9 +10,9 @@ jobs:
         node-version: [6.x]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v4
       with:
         node-version: ${{ matrix.node-version }}
     - run: npm install

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -8,11 +8,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
-          python-version: 3.9
+          python-version: '3.10'
       - name: Install flake8
         run: pip install --upgrade flake8
       - name: Run flake8
@@ -25,11 +25,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
-          python-version: 3.9
+          python-version: '3.10'
       - run: python -m pip install isort
       - name: isort
         uses: liskin/gh-problem-matcher-wrap@v1

diff --git a/.github/workflows/publish-to-live-pypi.yml b/.github/workflows/publish-to-live-pypi.yml
@@ -0,0 +1,41 @@
+name: Publish Python 🐍 distributions 📦 to pypi
+
+on:
+  release:
+    types:
+      - published
+
+jobs:
+  build-n-publish:
+    name: Build and publish Python 🐍 distributions 📦 to pypi
+    runs-on: ubuntu-latest
+    environment:
+      name: pypi
+      url: https://pypi.org/p/djangocms-moderation
+    permissions:
+      id-token: write
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Python 3.10
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.10'
+
+    - name: Install pypa/build
+      run: >-
+        python -m
+        pip install
+        build
+        --user
+    - name: Build a binary wheel and a source tarball
+      run: >-
+        python -m
+        build
+        --sdist
+        --wheel
+        --outdir dist/
+        .
+
+    - name: Publish distribution 📦 to PyPI
+      if: startsWith(github.ref, 'refs/tags')
+      uses: pypa/gh-action-pypi-publish@release/v1
diff --git a/.github/workflows/publish-to-test-pypi.yml b/.github/workflows/publish-to-test-pypi.yml
@@ -0,0 +1,43 @@
+name: Publish Python 🐍 distributions 📦 to TestPyPI
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  build-n-publish:
+    name: Build and publish Python 🐍 distributions 📦 to TestPyPI
+    runs-on: ubuntu-latest
+    environment:
+      name: test
+      url: https://test.pypi.org/p/djangocms-moderation
+    permissions:
+      id-token: write
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Python 3.10
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.10'
+
+    - name: Install pypa/build
+      run: >-
+        python -m
+        pip install
+        build
+        --user
+    - name: Build a binary wheel and a source tarball
+      run: >-
+        python -m
+        build
+        --sdist
+        --wheel
+        --outdir dist/
+        .
+
+    - name: Publish distribution 📦 to Test PyPI
+      uses: pypa/gh-action-pypi-publish@release/v1
+      with:
+        repository-url: https://test.pypi.org/legacy/
+        skip_existing: true
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -10,20 +10,26 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [ 3.7, 3.8, 3.9 ]  # latest release minus two
+        python-version: [ "3.10", "3.11", "3.12" ]  # latest release minus two
         requirements-file: [
-            dj22_cms40.txt,
-            dj32_cms40.txt,
+            dj50_cms41.txt,
+            dj42_cms41.txt,
+            dj42_cms40.txt,
         ]
         os: [
             ubuntu-20.04,
         ]
+        exclude:
+          - requirements-file: "dj42_cms40.txt"
+            python-version: "3.12" #cms40 not support py3.12 yet
+          - requirements-file: "dj32_cms40.txt"
+            python-version: "3.12"
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
 
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
@@ -33,7 +39,7 @@ jobs:
         python setup.py install
 
     - name: Run coverage
-      run: coverage run setup.py test
+      run: coverage run ./tests/settings.py
 
     - name: Upload Coverage to Codecov
-      uses: codecov/codecov-action@v3
+      uses: codecov/codecov-action@v5
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -9,41 +9,45 @@ ci:
 
 repos:
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.31.0
+    rev: v3.19.0
     hooks:
       - id: pyupgrade
-        args: ["--py37-plus"]
+        args: ["--py310-plus"]
 
   - repo: https://github.com/adamchainz/django-upgrade
-    rev: '1.4.0'
+    rev: '1.22.1'
     hooks:
       - id: django-upgrade
-        args: [--target-version, "2.2"]
+        args: [--target-version, "4.0"]
 
   - repo: https://github.com/PyCQA/flake8
-    rev: 4.0.1
+    rev: 7.1.1
     hooks:
       - id: flake8
 
   - repo: https://github.com/asottile/yesqa
-    rev: v1.3.0
+    rev: v1.5.0
     hooks:
       - id: yesqa
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.1.0
+    rev: v5.0.0
     hooks:
       - id: check-merge-conflict
       - id: debug-statements
       - id: mixed-line-ending
       - id: trailing-whitespace
-
+# upgrade the isort version to fix compatiable issue withe peotry: https://stackoverflow.com/questions/75269700/pre-commit-fails-to-install-isort-5-11-4-with-error-runtimeerror-the-poetry-co
   - repo: https://github.com/pycqa/isort
-    rev: 5.10.1
+    rev: 5.13.2
     hooks:
       - id: isort
 
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.1.0
+    rev: v2.3.0
     hooks:
       - id: codespell
+        exclude: >
+            (?x)^(
+                .*\.(js|po|json)
+            )$
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -4,7 +4,21 @@ Changelog
 
 Unreleased
 ==========
+fix: Add data-popup attr to a tag in burger menu item
+fix: Replace SortableAdminMixin by SortableAdminBase for WorkflowAdmin
+fix: Restore "In Collection" button in the toolbar
+fix: Update README.rst and add overview of settings
 
+2.2.1 (2024-07-02)
+==================
+* feat: Add multi select and add to moderation in admin for moderated_models
+
+2.2.0 (2024-05-16)
+==================
+* Python 3.8, 3.9 support removed
+* Python 3.10, 3.11 and 3.12 support added
+* Django 2.2 support removed
+* Django 4.2 support added
 * fix: Treebeard support improved by inheriting a treebeard template
 
 2.1.6 (2022-09-07)