Merge branch 'master' into develop

* master: Fix handling of programs that produce no output
jacebrowning · Oct 12, 2019 · 34083b8 · 34083b8
2 parents c27fb6c + 91ae75f
commit 34083b8
Show file tree

Hide file tree

Showing 5 changed files with 148 additions and 78 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 - Deprecated `versions` in favor of `version` option.
 - Deprecated `|` in favor of `||` for checking multiple versions.
+# 1.6.3 (2019-10-12)
+
+- Fixed handling of programs that produce no output.
 
 # 1.6.2 (2019-02-15)
 

diff --git a/Makefile b/Makefile
@@ -45,7 +45,7 @@ DEPENDENCIES := $(VIRTUAL_ENV)/.poetry-$(shell bin/checksum pyproject.toml poetr
 install: $(DEPENDENCIES) .cache
 
 $(DEPENDENCIES): poetry.lock
-	@ poetry config settings.virtualenvs.in-project true
+	@ poetry config settings.virtualenvs.in-project true || poetry config virtualenvs.in-project true
 	poetry install
 	@ touch $@