Skip to content

Commit e6831cc

Browse files
committed
pytest: call directly, not via setup.py
1 parent 93fdf07 commit e6831cc

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ diff_pylint_report: pylint_report.txt
123123
diff-quality --compare-branch=main --violations=pylint pylint_report.txt
124124

125125
.coverage:
126-
python setup.py test --addopts "--cov --cov-config=.coveragerc --cov-report= ${PYTEST_EXTRA}"
126+
pytest --cov --cov-config=.coveragerc --cov-report= ${PYTEST_EXTRA}
127127
$(COVBASE) -m schema_salad.main \
128128
--print-jsonld-context schema_salad/metaschema/metaschema.yml \
129129
> /dev/null
@@ -161,7 +161,7 @@ test: $(PYSOURCES)
161161

162162
## testcov : run the schema-salad test suite and collect coverage
163163
testcov: $(PYSOURCES)
164-
python setup.py test --addopts "--cov" ${PYTEST_EXTRA}
164+
pytest --cov ${PYTEST_EXTRA}
165165

166166
sloccount.sc: $(PYSOURCES) Makefile
167167
sloccount --duplicates --wide --details $^ > $@
@@ -182,7 +182,7 @@ mypy_3.6: $(filter-out setup.py,$(PYSOURCES))
182182
MYPYPATH=$$MYPYPATH:mypy-stubs mypy --python-version 3.6 $^
183183

184184
mypyc: $(PYSOURCES)
185-
MYPYPATH=mypy-stubs SCHEMA_SALAD_USE_MYPYC=1 python setup.py test --addopts "${PYTEST_EXTRA}"
185+
MYPYPATH=mypy-stubs SCHEMA_SALAD_USE_MYPYC=1 pytest "${PYTEST_EXTRA}"
186186

187187
mypyi:
188188
MYPYPATH=mypy-stubs SCHEMA_SALAD_USE_MYPYC=1 pip install .${EXTRAS}

mypy-requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
mypy==1.4.1 # update pyproject.toml as well
22
black>=19.10b0
3+
types-pkg_resources
34
types-requests
45
types-dataclasses
56
objgraph

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ requires = [
55
'mypy==0.971; python_version == "3.6"', # last version for Python 3.6
66
'mypy==1.4.1; python_version >= "3.7"', # update mypy-requirements as well
77
"black>=19.10b0",
8+
"types-pkg_resources",
89
"types-requests",
910
"types-dataclasses",
1011
"importlib_resources>=1.4", # equivalent to Python 3.9

0 commit comments

Comments
 (0)