X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FCryptoportfolio%2FTrader.git;a=blobdiff_plain;f=Makefile;h=3085503cdcf2c20d555b5ce9004f114ddecfc499;hp=dfbe3b46234cd4f3e5cd93260a9b68f87e58b25d;hb=a4bb44d8bc27af7c57f439ffd9edca51c2f0afb4;hpb=123411ccb5e004d38a9c75cb621a732a29edb09a

diff --git a/Makefile b/Makefile
index dfbe3b4..3085503 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,19 @@
 install:
+ifeq (${VIRTUAL_ENV},)
 	pip install --user -r requirements.txt
+else
+	pip install -r requirements.txt
+endif
 
 test:
 	python test.py
 
+test_unit:
+	python test.py --onlyunit
+
+test_acceptance:
+	python test.py --onlyacceptance
+
 run:
 	python portfolio.py
 
@@ -11,6 +21,8 @@ release_version = $(shell git describe --tags --always)
 release_file = trader_$(release_version).tar.gz
 folder = ~/.no_backup/projets/git.immae.eu/releases/cryptoportfolio/trader
 
+coverage_omit = "tests/*.py,test.py"
+
 build_release:
 	git archive HEAD -o $(release_file)
 	mv $(release_file) $(folder)
@@ -20,29 +32,29 @@ build_release:
 	@sha256sum $(folder)/$(release_file) | cut -d' ' -f1
 	@echo "================================="
 
-test_coverage_unit:
-	coverage run --source=. --omit=test.py test.py --onlyunit
+test_coverage:
+	coverage run --source=. --omit="$(coverage_omit)" test.py
 	coverage report -m
 
-test_coverage_unit_html: test_coverage_unit
+test_coverage_html: test_coverage
 	coverage html
 	rm ~/hosts/www.immae.eu/htmlcov -rf && cp -r htmlcov ~/hosts/www.immae.eu
 	@echo "coverage in https://www.immae.eu/htmlcov"
 
-test_coverage_acceptance:
-	coverage run --source=. --omit=test.py test.py --onlyacceptance
+test_coverage_unit:
+	coverage run --source=. --omit="$(coverage_omit)" test.py --onlyunit
 	coverage report -m
 
-test_coverage_acceptance_html: test_coverage_acceptance
+test_coverage_unit_html: test_coverage_unit
 	coverage html
 	rm ~/hosts/www.immae.eu/htmlcov -rf && cp -r htmlcov ~/hosts/www.immae.eu
 	@echo "coverage in https://www.immae.eu/htmlcov"
 
-test_coverage_all:
-	coverage run --source=. --omit=test.py test.py
+test_coverage_acceptance:
+	coverage run --source=. --omit="$(coverage_omit)" test.py --onlyacceptance
 	coverage report -m
 
-test_coverage_all_html: test_coverage_all
+test_coverage_acceptance_html: test_coverage_acceptance
 	coverage html
 	rm ~/hosts/www.immae.eu/htmlcov -rf && cp -r htmlcov ~/hosts/www.immae.eu
 	@echo "coverage in https://www.immae.eu/htmlcov"