Skip to content
Merged
Changes from 1 commit
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
Prev Previous commit
Next Next commit
Fix test execution errors specific to python3.6
  • Loading branch information
dhoomakethu committed Sep 9, 2020
commit f4425f763bf488aecef023913ceb980b2cdeacbc
8 changes: 8 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ VIRTUAL_ENV ?= $(WORKON_HOME)/pymodbus
PATH := $(VIRTUAL_ENV)/bin:$(PATH)
MAKE := $(MAKE) --no-print-directory
SHELL = bash
PYVER=$(shell python -c "import sys;t='{v[0]}.{v[1]}'.format(v=list(sys.version_info[:2]));print(t)")

default:
@echo 'Makefile for pymodbus'
Expand Down Expand Up @@ -37,10 +38,16 @@ check: install
@pip install --upgrade --quiet --requirement=requirements-checks.txt
@flake8


test: install
@pip install --upgrade --quiet --requirement=requirements-tests.txt
ifeq ($(PYVER),3.6)
@pytest --cov=pymodbus/ --cov-report term-missing test/test_server_asyncio.py test
@coverage report --fail-under=90 -i
else
@pytest --cov=pymodbus/ --cov-report term-missing
@coverage report --fail-under=90 -i
endif

tox: install
@pip install --upgrade --quiet tox && tox
Expand All @@ -57,6 +64,7 @@ publish: install
twine upload dist/*
$(MAKE) clean


clean:
@rm -Rf *.egg .eggs *.egg-info *.db .cache .coverage .tox build dist docs/build htmlcov doc/_build test/.Python test/pip-selfcheck.json test/lib/ test/include/ test/bin/
@find . -depth -type d -name __pycache__ -exec rm -Rf {} \;
Expand Down