From 9e753e2e606c75897e5b956ea2a1b5010d1743ee Mon Sep 17 00:00:00 2001 From: Fabio Pliger Date: Thu, 5 May 2022 13:03:59 -0500 Subject: [PATCH 1/2] Update pyscriptjs/Makefile Co-authored-by: Matt Kramer --- pyscriptjs/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyscriptjs/Makefile b/pyscriptjs/Makefile index 912b5123..12d54ccc 100644 --- a/pyscriptjs/Makefile +++ b/pyscriptjs/Makefile @@ -8,7 +8,7 @@ app_dir ?= $(shell git rev-parse --show-prefix) CONDA_ENV ?= ./env env := $(CONDA_ENV) - +conda_run := conda run -p $(env) .PHONY: clean clean: From 7ba5dc2d9704fc15a7e9eae6d40b3fd2273ebdc9 Mon Sep 17 00:00:00 2001 From: Fabio Pliger Date: Thu, 5 May 2022 13:06:58 -0500 Subject: [PATCH 2/2] Update pyscriptjs/Makefile Co-authored-by: Matt Kramer --- pyscriptjs/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyscriptjs/Makefile b/pyscriptjs/Makefile index 12d54ccc..73d07ab6 100644 --- a/pyscriptjs/Makefile +++ b/pyscriptjs/Makefile @@ -39,7 +39,7 @@ build: .PHONY: test test: @echo "Tests are coming :( this is a placeholder and it's meant to fail!" - $(env)/bin/pytest -vv $(ARGS) tests/ --log-cli-level=warning + $(conda_run) pytest -vv $(ARGS) tests/ --log-cli-level=warning .PHONY: test-py test-py: