From 294cc2d3dc474a2609015bc2554c8bc3fc5e22ed Mon Sep 17 00:00:00 2001 From: Manuel Barkhau Date: Thu, 6 Dec 2018 15:35:44 +0100 Subject: [PATCH] fix pypy env names --- makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/makefile b/makefile index bdd1798..b94006b 100644 --- a/makefile +++ b/makefile @@ -36,13 +36,14 @@ CONDA_BIN := $(CONDA_ROOT)/bin/conda ENV_PREFIX := $(CONDA_ROOT)/envs DEV_ENV_NAME := \ - $(subst py,$(PKG_NAME)_py,$(subst .,,$(subst =,,$(subst thon,,$(DEVELOPMENT_PYTHON_VERSION))))) + $(subst pypy,$(PKG_NAME)_pypy,$(subst python=,$(PKG_NAME)_py,$(subst .,,$(DEVELOPMENT_PYTHON_VERSION)))) CONDA_ENV_NAMES := \ - $(subst py,$(PKG_NAME)_py,$(subst .,,$(subst =,,$(subst thon,,$(SUPPORTED_PYTHON_VERSIONS))))) + $(subst pypy,$(PKG_NAME)_pypy,$(subst python=,$(PKG_NAME)_py,$(subst .,,$(SUPPORTED_PYTHON_VERSIONS)))) CONDA_ENV_PATHS := \ - $(subst py,${ENV_PREFIX}/$(PKG_NAME)_py,$(subst .,,$(subst =,,$(subst thon,,$(SUPPORTED_PYTHON_VERSIONS))))) + $(subst pypy,${ENV_PREFIX}/$(PKG_NAME)_pypy,$(subst python=,${ENV_PREFIX}/$(PKG_NAME)_py,$(subst .,,$(SUPPORTED_PYTHON_VERSIONS)))) + literal_space := $() $()