8000 Merge branch 'fpliger/69_add_makefile' of github.com:anaconda/pyscrip… · Nullinteger65/pyscript@3dc4d44 · GitHub
[go: up one dir, main page]
Skip to content

Commit 3dc4d44

Browse files
fpligerfpliger
committed
Merge branch 'fpliger/69_add_makefile' of github.com:anaconda/pyscript into fpliger/69_add_makefile
2 parents ce19ae6 + 7ba5dc2 commit 3dc4d44

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

‎pyscriptjs/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ app_dir ?= $(shell git rev-parse --show-prefix)
88

99
CONDA_ENV ?= ./env
1010
env := $(CONDA_ENV)
11-
11+
conda_run := conda run -p $(env)
1212

1313
.PHONY: clean
1414
clean:
@@ -39,7 +39,7 @@ build:
3939
.PHONY: test
4040
test:
4141
@echo "Tests are coming :( this is a placeholder and it's meant to fail!"
42-
$(env)/bin/pytest -vv $(ARGS) tests/ --log-cli-level=warning
42+
$(conda_run) pytest -vv $(ARGS) tests/ --log-cli-level=warning
4343

4444
.PHONY: test-py
4545
test-py:

0 commit comments

Comments
 (0)
0