diff options
| author | Gertjan van den Burg <gertjanvandenburg@gmail.com> | 2021-01-14 21:12:15 +0000 |
|---|---|---|
| committer | Gertjan van den Burg <gertjanvandenburg@gmail.com> | 2021-01-14 21:12:15 +0000 |
| commit | b65ab442c9d808ea78e7ff01c85865c980881c3f (patch) | |
| tree | ed94ab19e99bcd0357927db11eba95e336a262d7 | |
| parent | debug venv dir on windows (diff) | |
| download | SyncRNG-b65ab442c9d808ea78e7ff01c85865c980881c3f.tar.gz SyncRNG-b65ab442c9d808ea78e7ff01c85865c980881c3f.zip | |
Allow bypassing of virtualenv
| -rw-r--r-- | .github/workflows/build.yml | 2 | ||||
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | python/Makefile | 6 |
3 files changed, 8 insertions, 3 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b2068e2..9a0f5fa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -50,5 +50,5 @@ jobs: uses: actions/checkout@v2 - name: Build - run: make test_python + run: make test_python_direct @@ -31,6 +31,9 @@ test_R: test_python: $(MAKE) -C $(PYTHON_DIR) test +test_python_direct: + $(MAKE) -C $(PYTHON_DIR) test_direct + ############ # Clean up # ############ diff --git a/python/Makefile b/python/Makefile index 6b98eac..8c2fca6 100644 --- a/python/Makefile +++ b/python/Makefile @@ -51,11 +51,14 @@ dist: ## Make Python source distribution # Testing # ########### -.PHONY: test +.PHONY: test test_direct test: venv ## Run nosetests using the default nosetests command source $(VENV_DIR)/bin/activate && green -a -vv ./tests +test_direct: + pip install -e .[dev] && green -a -vv ./tests + ####################### # Virtual environment # ####################### @@ -66,7 +69,6 @@ venv: $(VENV_DIR)/bin/activate $(VENV_DIR)/bin/activate: test -d $(VENV_DIR) || python -m venv $(VENV_DIR) - ls -R $(VENV_DIR) source $(VENV_DIR)/bin/activate && pip install -e .[dev] touch $(VENV_DIR)/bin/activate |