From 4dd7ecf640534b84d9780141b68b5572cb44aa43 Mon Sep 17 00:00:00 2001
From: Manuel Barkhau <mbarkhau@gmail.com>
Date: Fri, 15 Feb 2019 01:30:00 +0100
Subject: [PATCH] fix pypy not being tested

---
 makefile.extra.make | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/makefile.extra.make b/makefile.extra.make
index 70e48d8..0068ea2 100644
--- a/makefile.extra.make
+++ b/makefile.extra.make
@@ -16,6 +16,14 @@ compat_test/%.py: test/%.py
 	mv $@.tmp $@;
 
 
+CONDA_ENV_PYS := \
+	$(shell echo "$(CONDA_ENV_PATHS)" \
+	| sed 's!\(_py[[:digit:]]\+\)!\1/bin/python!g' \
+	| sed 's!\(_pypy2[[:digit:]]\)!\1/bin/pypy!g' \
+	| sed 's!\(_pypy3[[:digit:]]\)!\1/bin/pypy3!g' \
+)
+
+
 ## Run pytest integration tests
 .PHONY: test_compat
 test_compat: $(COMPAT_TEST_FILES)
@@ -28,9 +36,9 @@ test_compat: $(COMPAT_TEST_FILES)
 	mkdir -p build/test_wheel;
 	$(DEV_ENV_PY) setup.py bdist_wheel --dist-dir build/test_wheel;
 
-	IFS=' ' read -r -a env_paths <<< "$(CONDA_ENV_PATHS)"; \
-	for i in $${!env_paths[@]}; do \
-		env_py=$${env_paths[i]}/bin/python; \
+	IFS=' ' read -r -a env_pys <<< "$(CONDA_ENV_PYS)"; \
+	for i in $${!env_pys[@]}; do \
+		env_py=$${env_pys[i]}; \
 		$${env_py} -m pip install --upgrade build/test_wheel/*.whl; \
 		PYTHONPATH="" ENV=$${ENV-dev} \
 			$${env_py} -m pytest --verbose compat_test/; \