technofab/bumpver
1
0
Fork 0
mirror of https://github.com/TECHNOFAB11/bumpver.git synced 2025-12-12 06:20:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix make/bash escape issue

Browse source
This commit is contained in:
Manuel Barkhau 2018-11-22 17:45:56 +01:00
parent 05350a3eb9
commit 3234fb97f9
1 changed files with 15 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

15
makefile
View file

@ -294,6 +294,7 @@ test:
@rm -rf "src/__pycache__"; @rm -rf "src/__pycache__";
@rm -rf "test/__pycache__"; @rm -rf "test/__pycache__";
ifndef FILTER
ENV=$${ENV-dev} PYTHONPATH=src/:vendor/:$$PYTHONPATH \ ENV=$${ENV-dev} PYTHONPATH=src/:vendor/:$$PYTHONPATH \
$(DEV_ENV_PY) -m pytest -v \ $(DEV_ENV_PY) -m pytest -v \
--doctest-modules \ --doctest-modules \
@ -301,6 +302,16 @@ test:
--cov-report term \ --cov-report term \
$(shell ls -1 src/ | awk '{ print "--cov "$$1 }') \ $(shell ls -1 src/ | awk '{ print "--cov "$$1 }') \
test/ src/; test/ src/;
else
ENV=$${ENV-dev} PYTHONPATH=src/:vendor/:$$PYTHONPATH \
$(DEV_ENV_PY) -m pytest -v \
--doctest-modules \
--cov-report html \
--cov-report term \
$(shell ls -1 src/ | awk '{ print "--cov "$$1 }') \
-k $(FILTER) \
test/ src/;
endif
@rm -rf ".pytest_cache"; @rm -rf ".pytest_cache";
@rm -rf "src/__pycache__"; @rm -rf "src/__pycache__";
@ -320,7 +331,11 @@ check: fmt lint mypy test
env: env:
@bash --init-file <(echo '\ @bash --init-file <(echo '\
source $$HOME/.bashrc; \ source $$HOME/.bashrc; \
<<<<<<< HEAD
source $(CONDA_ROOT)/etc/profile.d/conda.sh \ source $(CONDA_ROOT)/etc/profile.d/conda.sh \
=======
source $(CONDA_ROOT)/etc/profile.d/conda.sh; \
>>>>>>> fix make/bash escape issue
export ENV=$${ENV-dev}; \ export ENV=$${ENV-dev}; \
export PYTHONPATH="src/:vendor/:$$PYTHONPATH"; \ export PYTHONPATH="src/:vendor/:$$PYTHONPATH"; \
conda activate $(DEV_ENV_NAME) \ conda activate $(DEV_ENV_NAME) \