Skip to content

Commit 7537fcb

Browse files
authored
fix: compatibility with django 5.2 (#269)
* fix: compatibility with django 5.2 * update actions/upload-artifact to v4 * use codecov action instead of npm package
1 parent f9508c4 commit 7537fcb

File tree

20 files changed

+1621
-1642
lines changed

20 files changed

+1621
-1642
lines changed

.github/workflows/test.yml

Lines changed: 29 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@ jobs:
1616
include:
1717
- python-version: "3.9"
1818
django-version: "4.2"
19-
grappelli: "1"
20-
- python-version: "3.9"
21-
django-version: "5.0"
2219
grappelli: "0"
2320
- python-version: "3.10"
24-
django-version: "5.0"
21+
django-version: "4.2"
2522
grappelli: "1"
26-
- python-version: "3.12"
23+
- python-version: "3.11"
2724
django-version: "5.1"
2825
grappelli: "0"
26+
- python-version: "3.13"
27+
django-version: "5.2"
28+
grappelli: "0"
2929

3030
runs-on: ubuntu-latest
3131
name: Django ${{ matrix.django-version }} (Python ${{ matrix.python-version }})${{ matrix.grappelli == '1' && ' + grappelli' || '' }}
@@ -86,29 +86,35 @@ jobs:
8686
8787
- name: Run tests
8888
run: |
89-
tox -- -vvv --selenosis-driver=chrome-headless || \
90-
tox -- -vvv --selenosis-driver=chrome-headless
89+
tox -- -vvv --selenosis-driver=chrome-headless --retries 3 || \
90+
tox -- -vvv --selenosis-driver=chrome-headless --retries 3
9191
env:
9292
PIXELMATCH_BIN: ${{ env.GITHUB_WORKSPACE }}/node_modules/.bin/pixelmatch
9393

94-
- name: Upload junit xml
95-
if: always()
96-
uses: actions/upload-artifact@v3
97-
with:
98-
name: junit-reports
99-
path: reports/*.xml
100-
101-
- name: Upload python coverage
94+
- name: Generate python coverage
10295
run: |
10396
tox -e coverage-report
104-
tox -e codecov
105-
env:
106-
CODECOV_NAME: ${{ github.workflow }}
10797
108-
- name: Upload js coverage
109-
run: npm run report && npm run codecov
110-
env:
111-
CODECOV_NAME: ${{ github.workflow }}
98+
- uses: codecov/codecov-action@v5
99+
name: Upload python coverage
100+
with:
101+
files: .tox/coverage/coverage.xml
102+
flags: python
103+
name: ${{ github.workflow }}
104+
token: ${{ secrets.CODECOV_TOKEN }}
105+
verbose: true
106+
107+
- name: Generate js coverage report
108+
run: npm run report
109+
110+
- uses: codecov/codecov-action@v5
111+
name: Upload js coverage
112+
with:
113+
files: coverage/lcov.info
114+
flags: javascript
115+
name: ${{ github.workflow }}
116+
token: ${{ secrets.CODECOV_TOKEN }}
117+
verbose: true
112118

113119
lint:
114120
runs-on: ubuntu-latest
@@ -180,26 +186,8 @@ jobs:
180186
run: |
181187
npm run lint:${{ matrix.tool }}
182188
183-
report:
184-
if: always()
185-
needs: build
186-
runs-on: ubuntu-latest
187-
name: "Report Test Results"
188-
steps:
189-
- uses: actions/download-artifact@v3
190-
with:
191-
name: junit-reports
192-
193-
- name: Publish tests report
194-
uses: mikepenz/action-junit-report@1a91e26932fb7ba410a31fab1f09266a96d29971
195-
with:
196-
report_paths: ./*.xml
197-
require_tests: true
198-
fail_on_failure: true
199-
check_name: Test Report
200-
201189
success:
202-
needs: [lint, report]
190+
needs: [lint, build]
203191
runs-on: ubuntu-latest
204192
name: Test Successful
205193
steps:

nested_admin/nested.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ def _djn_js_deps(self):
5656
"admin/js/jquery.init.js",
5757
"admin/js/prepopulate.js",
5858
"admin/js/prepopulate.min.js",
59+
"admin/js/SelectBox.js",
5960
"admin/js/SelectFilter2.js",
6061
"admin/js/autocomplete.js",
6162
"jquery.grp.autocomplete_fk.js",

nested_admin/static/nested_admin/dist/nested_admin.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nested_admin/static/nested_admin/dist/nested_admin.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nested_admin/static/nested_admin/dist/nested_admin.js

Lines changed: 42 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nested_admin/static/nested_admin/dist/nested_admin.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nested_admin/static/nested_admin/dist/nested_admin.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nested_admin/static/nested_admin/dist/nested_admin.min.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nested_admin/static/nested_admin/dist/nested_admin.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nested_admin/static/nested_admin/dist/nested_admin.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)