From 709f9fd0bf092a4328038923fca890d3aad5632d Mon Sep 17 00:00:00 2001 From: Alinson S Xavier Date: Sun, 12 Apr 2020 11:06:41 -0500 Subject: [PATCH] Run Julia tests on "make test" --- Makefile | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 3ca9137..c2a14b5 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,15 @@ PYTEST_ARGS := -W ignore::DeprecationWarning -vv -x --log-level=DEBUG +JULIA := julia --color=yes --project=src/julia all: docs test develop: cd src/python && python setup.py develop - julia --project=src/julia -e "using Pkg; Pkg.instantiate()" + $(JULIA) -e "using Pkg; Pkg.instantiate()" install: cd src/python && python setup.py install - julia --project=src/julia -e "using Pkg; Pkg.instantiate()" + $(JULIA) -e "using Pkg; Pkg.instantiate()" uninstall: pip uninstall miplearn @@ -16,10 +17,15 @@ uninstall: docs: mkdocs build -test: +test: test-python test-julia + +test-python: cd src/python && pytest $(PYTEST_ARGS) +test-julia: + $(JULIA) -e 'using Pkg; Pkg.test("MIPLearn")' + test-watch: cd src/python && pytest-watch -- $(PYTEST_ARGS) -.PHONY: test test-watch docs +.PHONY: test test-python test-julia test-watch docs