Skip to content

Commit fc064b0

Browse files
committed
build: Use coverage directly, instead of pytest-cov
1 parent af0543b commit fc064b0

File tree

7 files changed

+27
-54
lines changed

7 files changed

+27
-54
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@ jobs:
2626
./manage.py makemigrations --check --dry-run
2727
./manage.py check --fail-level WARNING
2828
coverage run --source core,process manage.py test
29-
- env:
30-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
31-
run: coveralls --service=github
29+
- uses: coverallsapp/github-action@v2
3230
services:
3331
postgres:
3432
image: postgres:12

.pre-commit-config.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ci:
33
skip: [pip-compile]
44
repos:
55
- repo: https://github.com/astral-sh/ruff-pre-commit
6-
rev: v0.5.0
6+
rev: v0.6.3
77
hooks:
88
- id: ruff
99
- id: ruff-format
@@ -17,8 +17,9 @@ repos:
1717
- id: pip-compile
1818
name: pip-compile requirements.in
1919
args: [requirements.in, -o, requirements.txt]
20+
files: ^requirements(_nongpl)?\.(in|txt)$
2021
- id: pip-compile
2122
name: pip-compile requirements_dev.in
2223
args: [requirements_dev.in, -o, requirements_dev.txt]
23-
files: ^requirements_dev\.(in|txt)$
24+
files: ^requirements(_nongpl|_dev)?\.(in|txt)$
2425
exclude: /migrations/

pyproject.toml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,16 @@ select = ["ALL"]
1111
ignore = [
1212
"ANN", "COM", "EM",
1313
# https://docs.astral.sh/ruff/formatter/#conflicting-lint-rules
14-
"W191", "E501", "D206", "Q000", "Q001", "Q002", "Q003", "ISC001",
14+
"W191", "D206", "Q000", "Q001", "Q002", "Q003", "ISC001",
1515
"D203", "D212", # ignore incompatible rules
1616
"D200", # documentation preferences
17-
"C901", "PLR0912", # complexity preferences
17+
"C901", "PLR091", # complexity preferences
1818
"D1", # docstrings
1919
"PTH", # pathlib
2020
"A002", # compile builtin
21-
"ARG001", # yapw callbacks
22-
"ARG002", # Django request argument
21+
"ARG001", "ARG002", "RUF012", # Django
2322
"N818", # AlreadyExists error
24-
"PLR0911", # Too many returns
25-
"PLR0913", # Too many arguments
2623
"PLW2901", # release_or_record overridden
27-
"RUF012", # Django class attributes
2824
"S104", # Docker ALLOWED_HOSTS
2925
"S324", # md5 hash
3026
"TRY003", # Django command errors
@@ -41,7 +37,6 @@ builtins-ignorelist = ["copyright"]
4137
"PT", # unittest
4238
"ARG002", # mocks
4339
"BLE001", # Exception
44-
"PLR0913", # Too many arguments
4540
"PLR2004", # Magic value used
4641
"S101", # assert
4742
]

requirements.txt

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# This file was autogenerated by uv via the following command:
2-
# uv pip compile requirements.in -o requirements.txt --no-strip-extras
2+
# uv pip compile requirements.in -o requirements.txt
33
asgiref==3.7.2
44
# via
55
# -r requirements_nongpl.txt
@@ -57,7 +57,7 @@ et-xmlfile==1.1.0
5757
# via openpyxl
5858
flattentool==0.24.0
5959
# via libcove
60-
gunicorn[setproctitle]==22.0.0
60+
gunicorn==22.0.0
6161
# via -r requirements_nongpl.txt
6262
idna==3.7
6363
# via
@@ -97,7 +97,7 @@ jsonschema-specifications==2023.12.1
9797
# jsonschema
9898
libcove==0.32.0
9999
# via libcoveocds
100-
libcoveocds[perf]==0.13.0
100+
libcoveocds==0.13.0
101101
# via -r requirements.in
102102
lxml==4.9.4
103103
# via flattentool
@@ -106,7 +106,7 @@ ocdsextensionregistry==0.3.6
106106
# -r requirements_nongpl.txt
107107
# libcoveocds
108108
# ocdskit
109-
ocdskit[perf]==1.1.10
109+
ocdskit==1.1.10
110110
# via -r requirements_nongpl.txt
111111
ocdsmerge==0.6.6
112112
# via
@@ -120,8 +120,6 @@ orjson==3.9.15
120120
# via
121121
# -r requirements_nongpl.txt
122122
# libcoveocds
123-
# ocdskit
124-
# yapw
125123
packaging==24.0
126124
# via
127125
# -r requirements_nongpl.txt
@@ -181,9 +179,7 @@ schema==0.7.5
181179
sentry-sdk==2.8.0
182180
# via -r requirements_nongpl.txt
183181
setproctitle==1.2.2
184-
# via
185-
# -r requirements_nongpl.txt
186-
# gunicorn
182+
# via -r requirements_nongpl.txt
187183
setuptools==74.1.1
188184
# via
189185
# zc-lockfile
@@ -224,7 +220,7 @@ urllib3==2.2.2
224220
# sentry-sdk
225221
xmltodict==0.13.0
226222
# via flattentool
227-
yapw[perf]==0.1.4
223+
yapw==0.1.4
228224
# via -r requirements_nongpl.txt
229225
zc-lockfile==3.0.post1
230226
# via zodb

requirements_dev.in

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
-r requirements.txt
22
coverage
3-
coveralls
4-
pre-commit
53
psycopg2-binary
6-
ruff
4+
pre-commit

requirements_dev.txt

Lines changed: 9 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ cffi==1.16.0
3232
# via
3333
# -r requirements.txt
3434
# persistent
35-
cfgv==3.3.1
35+
cfgv==3.4.0
3636
# via pre-commit
3737
charset-normalizer==2.0.8
3838
# via
@@ -47,16 +47,12 @@ contextlib2==21.6.0
4747
# -r requirements.txt
4848
# schema
4949
coverage==6.5.0
50-
# via
51-
# -r requirements_dev.in
52-
# coveralls
53-
coveralls==3.3.1
5450
# via -r requirements_dev.in
5551
defusedxml==0.7.1
5652
# via
5753
# -r requirements.txt
5854
# odfpy
59-
distlib==0.3.6
55+
distlib==0.3.8
6056
# via virtualenv
6157
dj-database-url==2.0.0
6258
# via -r requirements.txt
@@ -73,23 +69,21 @@ djangorestframework==3.15.2
7369
# via
7470
# -r requirements.txt
7571
# drf-spectacular
76-
docopt==0.6.2
77-
# via coveralls
7872
drf-spectacular==0.27.2
7973
# via -r requirements.txt
8074
et-xmlfile==1.1.0
8175
# via
8276
# -r requirements.txt
8377
# openpyxl
84-
filelock==3.12.2
78+
filelock==3.15.4
8579
# via virtualenv
8680
flattentool==0.24.0
8781
# via
8882
# -r requirements.txt
8983
# libcove
9084
gunicorn==22.0.0
9185
# via -r requirements.txt
92-
identify==2.3.5
86+
identify==2.6.0
9387
# via pre-commit
9488
idna==3.7
9589
# via
@@ -137,7 +131,7 @@ lxml==4.9.4
137131
# via
138132
# -r requirements.txt
139133
# flattentool
140-
nodeenv==1.6.0
134+
nodeenv==1.9.1
141135
# via pre-commit
142136
ocdsextensionregistry==0.3.6
143137
# via
@@ -159,11 +153,7 @@ openpyxl==3.1.2
159153
# -r requirements.txt
160154
# flattentool
161155
orjson==3.9.15
162-
# via
163-
# -r requirements.txt
164-
# libcoveocds
165-
# ocdskit
166-
# yapw
156+
# via -r requirements.txt
167157
packaging==24.0
168158
# via
169159
# -r requirements.txt
@@ -182,7 +172,7 @@ platformdirs==3.8.1
182172
# -r requirements.txt
183173
# requests-cache
184174
# virtualenv
185-
pre-commit==3.6.0
175+
pre-commit==3.8.0
186176
# via -r requirements_dev.in
187177
psycopg2==2.9.6
188178
# via -r requirements.txt
@@ -211,7 +201,6 @@ referencing==0.34.0
211201
requests==2.32.3
212202
# via
213203
# -r requirements.txt
214-
# coveralls
215204
# libcove
216205
# libcoveocds
217206
# ocdsextensionregistry
@@ -234,18 +223,14 @@ rpds-py==0.18.0
234223
# -r requirements.txt
235224
# jsonschema
236225
# referencing
237-
ruff==0.6.3
238-
# via -r requirements_dev.in
239226
schema==0.7.5
240227
# via
241228
# -r requirements.txt
242229
# flattentool
243230
sentry-sdk==2.8.0
244231
# via -r requirements.txt
245232
setproctitle==1.2.2
246-
# via
247-
# -r requirements.txt
248-
# gunicorn
233+
# via -r requirements.txt
249234
setuptools==74.1.1
250235
# via
251236
# -r requirements.txt
@@ -287,7 +272,7 @@ urllib3==2.2.2
287272
# requests
288273
# requests-cache
289274
# sentry-sdk
290-
virtualenv==20.23.1
275+
virtualenv==20.24.1
291276
# via pre-commit
292277
xmltodict==0.13.0
293278
# via

requirements_nongpl.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# This file was autogenerated by uv via the following command:
2-
# uv pip compile requirements_nongpl.in -o requirements_nongpl.txt --no-strip-extras
2+
# uv pip compile requirements_nongpl.in -o requirements_nongpl.txt
33
asgiref==3.7.2
44
# via django
55
attrs==23.1.0
@@ -33,7 +33,7 @@ djangorestframework==3.15.2
3333
# drf-spectacular
3434
drf-spectacular==0.27.2
3535
# via -r requirements_nongpl.in
36-
gunicorn[setproctitle]==22.0.0
36+
gunicorn==22.0.0
3737
# via -r requirements_nongpl.in
3838
idna==3.7
3939
# via requests
@@ -58,7 +58,7 @@ ocdsextensionregistry==0.3.6
5858
# via
5959
# -r requirements_nongpl.in
6060
# ocdskit
61-
ocdskit[perf]==1.1.10
61+
ocdskit==1.1.10
6262
# via -r requirements_nongpl.in
6363
ocdsmerge==0.6.6
6464
# via
@@ -115,5 +115,5 @@ urllib3==2.2.2
115115
# requests
116116
# requests-cache
117117
# sentry-sdk
118-
yapw[perf]==0.1.4
118+
yapw==0.1.4
119119
# via -r requirements_nongpl.in

0 commit comments

Comments
 (0)