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

diff --git a/Makefile b/Makefile
index dfbe3b4..00e18a3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,16 @@
 install:
+ifeq (${VIRTUAL_ENV},)
 	pip install --user -r requirements.txt
+else
+	pip install -r requirements.txt
+endif
 
 test:
 	python test.py
 
+test_acceptance:
+	python test_acceptance.py
+
 run:
 	python portfolio.py
 
@@ -11,6 +18,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,test_acceptance.py"
+
 build_release:
 	git archive HEAD -o $(release_file)
 	mv $(release_file) $(folder)
@@ -21,7 +30,7 @@ build_release:
 	@echo "================================="
 
 test_coverage_unit:
-	coverage run --source=. --omit=test.py test.py --onlyunit
+	coverage run --source=. --omit="$(coverage_omit)" test.py
 	coverage report -m
 
 test_coverage_unit_html: test_coverage_unit
@@ -30,19 +39,10 @@ test_coverage_unit_html: test_coverage_unit
 	@echo "coverage in https://www.immae.eu/htmlcov"
 
 test_coverage_acceptance:
-	coverage run --source=. --omit=test.py test.py --onlyacceptance
+	coverage run --source=. --omit="$(coverage_omit)" test_acceptance.py
 	coverage report -m
 
 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"
-
-test_coverage_all:
-	coverage run --source=. --omit=test.py test.py
-	coverage report -m
-
-test_coverage_all_html: test_coverage_all
-	coverage html
-	rm ~/hosts/www.immae.eu/htmlcov -rf && cp -r htmlcov ~/hosts/www.immae.eu
-	@echo "coverage in https://www.immae.eu/htmlcov"