diff --git a/taskcluster/arm64-build.sh b/taskcluster/arm64-build.sh index 26518d2d..dd0f77ff 100644 --- a/taskcluster/arm64-build.sh +++ b/taskcluster/arm64-build.sh @@ -21,7 +21,7 @@ do_bazel_build do_deepspeech_binary_build -export SUPPORTED_PYTHON_VERSIONS="3.7.6:ucs4" +export SUPPORTED_PYTHON_VERSIONS="3.7.6:ucs2" do_deepspeech_python_build do_deepspeech_nodejs_build diff --git a/taskcluster/rpi3-build.sh b/taskcluster/rpi3-build.sh index 3b17d7ef..2f1b29d3 100755 --- a/taskcluster/rpi3-build.sh +++ b/taskcluster/rpi3-build.sh @@ -21,7 +21,7 @@ do_bazel_build do_deepspeech_binary_build -export SUPPORTED_PYTHON_VERSIONS="3.7.6:ucs4" +export SUPPORTED_PYTHON_VERSIONS="3.7.6:ucs2" do_deepspeech_python_build do_deepspeech_nodejs_build diff --git a/taskcluster/tc-all-vars.sh b/taskcluster/tc-all-vars.sh index 4a54432f..8740725f 100755 --- a/taskcluster/tc-all-vars.sh +++ b/taskcluster/tc-all-vars.sh @@ -16,6 +16,9 @@ if [ "${OS}" = "${TC_MSYS_VERSION}" ]; then export SWIG_ROOT="$(cygpath ${USERPROFILE})/ds-swig" export PLATFORM_EXE_SUFFIX=.exe export DS_CPU_COUNT=$(nproc) + + # Those are the versions available on NuGet.org + export SUPPORTED_PYTHON_VERSIONS="3.5.4:ucs2 3.6.8:ucs2 3.7.6:ucs2 3.8.1:ucs2" fi; if [ "${OS}" = "Darwin" ]; then @@ -94,7 +97,7 @@ model_source_mmap="$(dirname "${model_source}")/${model_name_mmap}" ldc93s1_sample_filename='' -SUPPORTED_PYTHON_VERSIONS=${SUPPORTED_PYTHON_VERSIONS:-3.5.8:ucs4 3.6.10:ucs4 3.7.6:ucs4 3.8.1:ucs4} +SUPPORTED_PYTHON_VERSIONS=${SUPPORTED_PYTHON_VERSIONS:-3.5.8:ucs2 3.6.10:ucs2 3.7.6:ucs2 3.8.1:ucs2} # When updating NodeJS / ElectronJS supported versions, do not forget to increment # deepspeech.node-gyp-cache. in both `system.node_gyp_cache` (taskcluster/.shared.yml) diff --git a/taskcluster/tc-py-utils.sh b/taskcluster/tc-py-utils.sh index d3dbaaa2..0e4b6664 100755 --- a/taskcluster/tc-py-utils.sh +++ b/taskcluster/tc-py-utils.sh @@ -348,7 +348,7 @@ extract_python_versions() elif [ "${_py_unicode_type}" = "mu" ]; then local _pyconf="ucs4" elif [ "${_py_unicode_type}" = "" ]; then # valid for Python 3.8 - local _pyconf="ucs4" + local _pyconf="ucs2" fi; local _pyalias="${_pyver}_${_pyconf}" diff --git a/taskcluster/win-build.sh b/taskcluster/win-build.sh index 39c3f261..0a0b9210 100755 --- a/taskcluster/win-build.sh +++ b/taskcluster/win-build.sh @@ -38,8 +38,6 @@ export PATH=$PATH:$(cygpath ${ChocolateyInstall})/bin:'/c/Program Files/nodejs/' do_deepspeech_binary_build -# Those are the versions available on NuGet.org -export SUPPORTED_PYTHON_VERSIONS="3.5.4 3.6.8 3.7.6 3.8.1" if [ "${runtime}" = "tflite" ]; then do_deepspeech_python_build "--tflite" else