8000 Merge branch 'develop-4' into fix/issue-7677 · django-cms/django-cms@ed21f1a · GitHub
[go: up one dir, main page]
Skip to content

Commit ed21f1a

Browse files
fsbraunfsbraun
authored
Merge branch 'develop-4' into fix/issue-7677
2 parents 844e6dd + 2d7ccc0 commit ed21f1a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+278
-178
lines changed

‎.github/workflows/codeql.yml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: "CodeQL"
2+
3+
on:
4+
push:
5+
branches: [ "develop", "develop-4", "release/0.10.x", "release/2.1.x", "release/2.2.x", "release/2.3.x", "release/2.4.x", "release/3.0.x", "release/3.1.x", "release/3.2.x", "release/3.3.x", "release/3.4.x", "release/3.5.x", "release/3.6.x", "release/3.7.x", "release/3.8.x", "release/3.9.x", "release/3.10.x", "release/3.11.x", "release/4.0.x", "release/4.0.0.x", "release/4.0.1.x", "release/4.1.x" ]
6+
pull_request:
7+
branches: [ "develop" ]
8+
schedule:
9+
- cron: "40 4 * * 6"
10+
11+
jobs:
12+
analyze:
13+
name: Analyze
14+
runs-on: ubuntu-latest
15+
permissions:
16+
actions: read
17+
contents: read
18+
security-events: write
19+
20+
strategy:
21+
fail-fast: false
22+
matrix:
23+
language: [ python, javascript ]
24+
25+
steps:
26+
- name: Checkout
27+
uses: actions/checkout@v3
28+
29+
- name: Initialize CodeQL
30+
uses: github/codeql-action/init@v2
31+
with:
32+
languages: ${{ matrix.language }}
33+
queries: +security-and-quality
34+
35+
- name: Autobuild
36+
uses: github/codeql-action/autobuild@v2
37+
if: ${{ matrix.language == 'python' || matrix.language == 'javascript' }}
38+
39+
- name: Perform CodeQL Analysis
40+
uses: github/codeql-action/analyze@v2
41+
with:
42+
category: "/language:${{ matrix.language }}"

‎.github/workflows/docs.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,23 @@ jobs:
1212
name: docs
1313
steps:
1414
- name: Checkout
15-
uses: actions/checkout@v2
15+
uses: actions/checkout@v3
1616
- name: Set up Python
17-
uses: actions/setup-python@v2
17+
uses: actions/setup-python@v3
1818
with:
19-
python-version: '3.9'
19+
python-version: "3.12"
2020
cache: 'pip'
2121
- name: Cache dependencies
22-
uses: actions/cache@v2
22+
uses: actions/cache@v3
2323
with:
2424
path: ~/.cache/pip
2525
key: ${{ runner.os }}-pip-${{ hashFiles('docs/requirements.txt') }}
2626
restore-keys: |
2727
${{ runner.os }}-pip-
2828
- run: python -m pip install -r docs/requirements.txt
29+
- run: python setup.py install
30+
- run: codespell -w *.rst
31+
- run: codespell -w --skip docs/spelling_wordlist docs
2932
- name: Build docs
3033
run: |
3134
cd docs

‎.github/workflows/frontend.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ jobs:
1414
node-version: ['18']
1515

1616
steps:
17-
- uses: actions/checkout@v2
17+
- uses: actions/checkout@v3
1818
- name: Use Node.js ${{ matrix.node-version }}
19-
uses: actions/setup-node@v2
19+
uses: actions/setup-node@v3
2020
with:
2121
node-version: ${{ matrix.node-version }}
2222
- run: npm install

‎.github/workflows/lint-pr.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: "Lint PR"
2+
3+
# Validates PR titles against the conventional commit spec
4+
# https://github.com/commitizen/conventional-commit-types
5+
6+
on:
7+
pull_request_target:
8+
types:
9+
- opened
10+
- edited
11+
- synchronize
12+
13+
jobs:
14+
main:
15+
name: Validate PR title
16+
runs-on: ubuntu-latest
17+
steps:
18+
- uses: amannn/action-semantic-pull-request@v4
19+
env:
20+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/linters.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Set up Python
1818
uses: actions/setup-python@v4
1919
with:
20-
python-version: "3.11"
20+
python-version: "3.12"
2121
cache: 'pip'
2222
- run: |
2323
python -m pip install --upgrade pip

‎.github/workflows/publish-to-live-pypi.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- uses: actions/checkout@v3
14-
- name: Set up Python 3.10
14+
- name: Set up Python 3.12
1515
uses: actions/setup-python@v3
1616
with:
17-
python-version: '3.10'
17+
python-version: '3.12'
1818

1919
- name: Install pypa/build
2020
run: >-

‎.github/workflows/publish-to-test-pypi.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- uses: actions/checkout@v3
15-
- name: Set up Python 3.10
15+
- name: Set up Python 3.12
1616
uses: actions/setup-python@v3
1717
with:
18-
python-version: '3.10'
18+
python-version: '3.12'
1919

2020
- name: Install pypa/build
2121
run: >-

‎.github/workflows/spelling.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: django CMS spelling
2+
3+
on: [push, pull_request]
4+
5+
concurrency:
6+
group: ${{ github.workflow }}-${{ github.ref }}
7+
cancel-in-progress: true
8+
9+
jobs:
10+
codespell:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- name: Checkout
14+
uses: actions/checkout@v3
15+
- name: codespell
16+
uses: codespell-project/actions-codespell@master

‎.github/workflows/test.yml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
python-version: [ 3.8, 3.9, '3.10', '3.11' ] # latest release minus two
15+
python-version: [ 3.9, '3.10', '3.11', '3.12' ] # latest release minus two
1616
requirements-file: [
1717
django-2.2.txt,
1818
django-3.2.txt,
@@ -57,6 +57,7 @@ jobs:
5757
pip install pytest
5858
pip install -r test_requirements/${{ matrix.requirements-file }}
5959
pip install -r test_requirements/databases.txt
60+
pip install -r docs/requirements.txt
6061
python setup.py install
6162
6263
- name: Test with django test runner
@@ -71,7 +72,7 @@ jobs:
7172
strategy:
7273
fail-fast: false
7374
matrix:
74-
python-version: [ 3.8, 3.9, '3.10', '3.11' ] # latest release minus two
75+
python-version: [ 3.9, '3.10', '3.11', '3.12' ] # latest release minus two
7576
requirements-file: [
7677
django-2.2.txt,
7778
django-3.2.txt,
@@ -115,6 +116,7 @@ jobs:
115116
pip install pytest
116117
pip install -r test_requirements/${{ matrix.requirements-file }}
117118
pip install -r test_requirements/databases.txt
119+
pip install -r docs/requirements.txt
118120
python setup.py install
119121
120122
@@ -129,7 +131,7 @@ jobs:
129131
strategy:
130132
fail-fast: false
131133
matrix:
132-
python-version: [ 3.8, 3.9, '3.10', '3.11' ] # latest release minus two
134+
python-version: [ 3.9, '3.10', '3.11', '3.12' ] # latest release minus two
133135
requirements-file: [
134136
django-2.2.txt,
135137
django-3.2.txt,
@@ -142,8 +144,6 @@ jobs:
142144
ubuntu-20.04,
143145
]
144146
exclude:
145-
- requirements-file: django-5.0.txt
146-
python-version: 3.8
147147
- requirements-file: django-5.0.txt
148148
python-version: 3.9
149149

@@ -161,6 +161,7 @@ jobs:
161161
python -m pip install --upgrade pip
162162
pip install pytest
163163
pip install -r test_requirements/${{ matrix.requirements-file }}
164+
pip install -r docs/requirements.txt
164165
python setup.py install
165166
166167
- name: Test with django test runner
@@ -173,7 +174,7 @@ jobs:
173174
strategy:
174175
fail-fast: false
175176
matrix:
176-
python-version: ['3.11']
177+
python-version: ['3.12']
177178
requirements-file: ['requirements_base.txt']
178179
django-version: [
179180
'https://github.com/django/django/archive/main.tar.gz'
@@ -195,6 +196,7 @@ jobs:
195196
python -m pip install --upgrade pip
196197
pip install -r test_requirements/${{ matrix.requirements-file }}
197198
pip install pytest ${{ matrix.django-version }}
199+
pip install --upgrade setuptools
198200
python setup.py install
199201
200202
- name: Test with django test runner
@@ -208,7 +210,7 @@ jobs:
208210
strategy:
209211
fail-fast: false
210212
matrix:
211-
python-version: ['3.11']
213+
python-version: ['3.12']
212214
requirements-file: ['requirements_base.txt']
213215
django-version: [
214216
'https://github.com/django/django/archive/main.tar.gz'
@@ -244,6 +246,7 @@ jobs:
244246
pip install -r test_requirements/${{ matrix.requirements-file }}
245247
pip install pytest ${{ matrix.django-version }}
246248
pip install -r test_requirements/databases.txt
249+
pip install -r docs/requirements.txt
247250
python setup.py install
248251
249252
- name: Test with django test runner
@@ -259,7 +262,7 @@ jobs:
259262
strategy:
260263
fail-fast: false
261264
matrix:
262-
python-version: ['3.11']
265+
python-version: ['3.12']
263266
requirements-file: ['requirements_base.txt']
264267
django-version: [
265268
'https://github.com/django/django/archive/main.tar.gz'
@@ -294,6 +297,7 @@ jobs:
294297
pip install -r test_requirements/${{ matrix.requirements-file }}
295298
pip install pytest ${{ matrix.django-version }}
296299
pip install -r test_requirements/databases.txt
300+
pip install -r docs/requirements.txt
297301
python setup.py install
298302
299303
- name: Test with django test runner

‎CHANGELOG.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -936,7 +936,7 @@ Thanks to all contributors for their efforts!
936936
- Fix issue on django >= 1.6 with page form fields.
937937
- Resolve jQuery namespace issues in admin page tree and changeform
938938
- Fix issues for PageField in Firefox/Safari
939-
- Fix some Python 3.4 compatibility issue when using proxy modles
939+
- Fix some Python 3.4 compatibility issue when using proxy models
940940
- Fix corner case in plugin copy
941941
- Documentation fixes
942942
- Minor code cleanups

0 commit comments

Comments
 (0)
0