Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
PYTHON := $(shell python -c 'import platform;print(platform.python_version().split(".")[0])')
PYTHON2 := $(shell if which python2 &>/dev/null;then which python2; elif [ "$(PYTHON)" == 2 ]; then which python; fi)
PYTHON3 := $(shell if which python3 &>/dev/null;then which python3; elif [ "$(PYTHON)" == 3 ]; then which python; fi)

all: build
Expand All @@ -15,7 +14,6 @@ clean:
.PHONY: clean

check:
if [ -x "$(PYTHON2)" ]; then $(PYTHON2) -m unittest varlink;fi
if [ -x "$(PYTHON3)" ]; then $(PYTHON3) -m unittest varlink;fi
.PHONY: check

Expand Down
3 changes: 1 addition & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,7 @@ commands = [

[tool.tox.env.mypy]
description = "Run type checking tool mypy"
# pytest-stub required for type hints to be available
deps = ["mypy", "pytest-stub"]
deps = ["mypy", "pytest<9.0.0"]
commands = [
["mypy", "--version"],
["mypy", "{posargs:varlink}"]
Expand Down