From 7239679296748d898496bc39524f0316310c74ae Mon Sep 17 00:00:00 2001 From: Manuel Barkhau Date: Fri, 15 Feb 2019 20:11:34 +0100 Subject: [PATCH] fix testing on pypy adendum --- makefile | 4 +++- src/pycalver/__main__.py | 0 2 files changed, 3 insertions(+), 1 deletion(-) mode change 100644 => 100755 src/pycalver/__main__.py diff --git a/makefile b/makefile index de02d17..0bdaac5 100644 --- a/makefile +++ b/makefile @@ -44,6 +44,9 @@ CONDA_ENV_NAMES := \ CONDA_ENV_PATHS := \ $(subst pypy,$(ENV_PREFIX)/$(PKG_NAME)_pypy,$(subst python=,$(ENV_PREFIX)/$(PKG_NAME)_py,$(subst .,,$(SUPPORTED_PYTHON_VERSIONS)))) +# envname/bin/python is unfortunately not always the correct +# interpreter. In the case of pypy it is either envname/bin/pypy or +# envname/bin/pypy3 CONDA_ENV_BIN_PYTHON_PATHS := \ $(shell echo "$(CONDA_ENV_PATHS)" \ | sed 's!\(_py[[:digit:]]\+\)!\1/bin/python!g' \ @@ -52,7 +55,6 @@ CONDA_ENV_BIN_PYTHON_PATHS := \ ) - empty := literal_space := $(empty) $(empty) diff --git a/src/pycalver/__main__.py b/src/pycalver/__main__.py old mode 100644 new mode 100755