From 9b7724e5596f2bbd6372823db82162b6a193368a Mon Sep 17 00:00:00 2001 From: Alexandre Lissy Date: Mon, 20 Apr 2020 12:39:48 +0200 Subject: [PATCH 1/3] Force ds-swig first in PATH to avoid messing if system-wide exists --- native_client/definitions.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/native_client/definitions.mk b/native_client/definitions.mk index 68da5f10..85592956 100644 --- a/native_client/definitions.mk +++ b/native_client/definitions.mk @@ -196,7 +196,7 @@ SWIG_BIN := swig$(PLATFORM_EXE_SUFFIX) DS_SWIG_BIN := ds-swig$(PLATFORM_EXE_SUFFIX) DS_SWIG_BIN_PATH := $(SWIG_ROOT)/bin -DS_SWIG_ENV := SWIG_LIB="$(SWIG_LIB)" PATH="${PATH}:$(DS_SWIG_BIN_PATH)" +DS_SWIG_ENV := SWIG_LIB="$(SWIG_LIB)" PATH="$(DS_SWIG_BIN_PATH):${PATH}" $(DS_SWIG_BIN_PATH)/swig: mkdir -p $(SWIG_ROOT) From 67522cc9863963ead247cbe1f7ab2c7394ae3f44 Mon Sep 17 00:00:00 2001 From: Alexandre Lissy Date: Mon, 20 Apr 2020 13:28:25 +0200 Subject: [PATCH 2/3] Force numba pinned version --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index bdd5682d..ba6332e1 100644 --- a/setup.py +++ b/setup.py @@ -73,6 +73,7 @@ def main(): 'bs4', 'pandas', 'requests', + 'numba == 0.47.0', # ships py3.5 wheel, depend on llvmlite 0.31.* 'librosa', 'soundfile', ] From 8835b4d64a80becaee61e1716b876f87136b0c41 Mon Sep 17 00:00:00 2001 From: Alexandre Lissy Date: Mon, 20 Apr 2020 13:49:34 +0200 Subject: [PATCH 3/3] Force numba pinned version --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index ba6332e1..15e0f930 100644 --- a/setup.py +++ b/setup.py @@ -73,7 +73,8 @@ def main(): 'bs4', 'pandas', 'requests', - 'numba == 0.47.0', # ships py3.5 wheel, depend on llvmlite 0.31.* + 'numba == 0.47.0', # ships py3.5 wheel + 'llvmlite == 0.31.0', # for numba==0.47.0 'librosa', 'soundfile', ]