Skip to content

Commit 7becc86

Browse files
mrbazzanfsbraun
andauthored
ci: CI related fix (#71)
* ci: Fix typo error in lint workflow * fix: Ruff-related Warnings and typo * fix: Remove use of deprecated <setup.py test> * Remove 'mptt' from INSTALLED_APPS * ci: Remove outdated Python 3.8 workflow * ci: fix Tox workflow * Generate new requirements * ci: Fix coverage execution --------- Co-authored-by: Fabian Braun <[email protected]>
1 parent afc80f2 commit 7becc86

20 files changed

+2644
-667
lines changed

.coveragerc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
[run]
22
branch = True
3+
parallel = True
34
source = djangocms_file
45
omit =
56
migrations/*

.github/workflows/codecov.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ jobs:
1919
fail-fast: false
2020
matrix:
2121
python-version:
22-
- 3.8
2322
- 3.9
2423
- '3.10'
2524
- '3.11'
@@ -45,7 +44,8 @@ jobs:
4544
- name: Upload coverage data
4645
uses: actions/upload-artifact@v4
4746
with:
48-
name: coverage-data
47+
name: coverage-data-${{ matrix.python-version }}
48+
include-hidden-files: true
4949
path: '.coverage*'
5050

5151
coverage:
@@ -65,10 +65,12 @@ jobs:
6565
- name: Download data
6666
uses: actions/download-artifact@v4
6767
with:
68-
name: coverage-data
68+
pattern: coverage-data-*
69+
merge-multiple: true
6970

7071
- name: Combine coverage and fail if it's <100%
7172
run: |
73+
python -m coverage combine
7274
python -m coverage html --skip-covered --skip-empty
7375
python -m coverage report --fail-under=100
7476

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ jobs:
2424
pip install ruff
2525
- name: Run Ruff
2626
run: |
27-
ruff djangocms_file
27+
ruff check djangocms_file

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ exclude = [
44
".venv",
55
"**/migrations/**",
66
]
7-
ignore = [
7+
lint.ignore = [
88
"E501", # line too long
99
"F403", # 'from module import *' used; unable to detect undefined names
1010
"E701", # multiple statements on one line (colon)
1111
"F401", # module imported but unused
1212
]
1313
line-length = 119
14-
select = [
14+
lint.select = [
1515
"I",
1616
"E",
1717
"F",

setup.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,5 +58,4 @@
5858
zip_safe=False,
5959
install_requires=REQUIREMENTS,
6060
classifiers=CLASSIFIERS,
61-
test_suite='tests.settings.run',
6261
)

tests/requirements/compile.py

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -19,48 +19,6 @@
1919
] + sys.argv[1:]
2020
# mysqlclient requirements found on each version's "Databases" documentation page:
2121
# https://docs.djangoproject.com/en/3.0/ref/databases/#mysql-db-api-drivers
22-
subprocess.run(
23-
[
24-
"python3.8",
25-
*common_args,
26-
"-P",
27-
"Django>=3.2a1,<3.3",
28-
"-P",
29-
"django-cms>=3.8,<3.9",
30-
"-o",
31-
"py38-django32-cms38.txt",
32-
],
33-
check=True,
34-
capture_output=True,
35-
)
36-
subprocess.run(
37-
[
38-
"python3.8",
39-
*common_args,
40-
"-P",
41-
"Django>=3.2a1,<3.3",
42-
"-P",
43-
"django-cms>=3.9,<3.10",
44-
"-o",
45-
"py38-django32-cms39.txt",
46-
],
47-
check=True,
48-
capture_output=True,
49-
)
50-
subprocess.run(
51-
[
52-
"python3.8",
53-
*common_args,
54-
"-P",
55-
"Django>=3.2a1,<3.3",
56-
"-P",
57-
"django-cms>=3.10,<3.11",
58-
"-o",
59-
"py38-django32-cms310.txt",
60-
],
61-
check=True,
62-
capture_output=True,
63-
)
6422
subprocess.run(
6523
[
6624
"python3.9",

tests/requirements/py310-django32-cms310.txt

Lines changed: 295 additions & 4 deletions
Large diffs are not rendered by default.

tests/requirements/py310-django32-cms38.txt

Lines changed: 296 additions & 4 deletions
Large diffs are not rendered by default.

tests/requirements/py310-django32-cms39.txt

Lines changed: 295 additions & 4 deletions
Large diffs are not rendered by default.

tests/requirements/py310-django42-cms311.txt

Lines changed: 303 additions & 7 deletions
Large diffs are not rendered by default.

tests/requirements/py311-django42-cms311.txt

Lines changed: 303 additions & 7 deletions
Large diffs are not rendered by default.

tests/requirements/py38-django32-cms310.txt

Lines changed: 0 additions & 109 deletions
This file was deleted.

tests/requirements/py38-django32-cms38.txt

Lines changed: 0 additions & 109 deletions
This file was deleted.

0 commit comments

Comments
 (0)