Deprecate training on Python 2.7

2019-05-10 13:11:02 +02:00 · 2019-05-10 13:11:02 +02:00 · af26d8b2bb
--- a/bin/benchmark_nc.py
+++ b/bin/benchmark_nc.py
@ -26,6 +26,7 @@ import zipfile

 from six import iteritems
 from six.moves import range, map
+from functools import cmp_to_key

 r'''
 Tool to:
@ -74,16 +75,16 @@ def get_arch_string():
        raise AssertionError('Error checking OS')

    stdout = stdout.lower().strip()
-    if not 'linux' in stdout:
+    if not b'linux' in stdout:
        raise AssertionError('Unsupported OS')

-    if 'armv7l' in stdout:
+    if b'armv7l' in stdout:
        return 'arm'

-    if 'x86_64' in stdout:
+    if b'x86_64' in stdout:
        nv_rc, nv_stdout, nv_stderr = exec_command('nvidia-smi')
        nv_stdout = nv_stdout.lower().strip()
-        if 'NVIDIA-SMI' in nv_stdout:
+        if b'NVIDIA-SMI' in nv_stdout:
            return 'gpu'
        else:
            return 'cpu'
@ -181,7 +182,7 @@ def all_files(models=[]):
            return 1

    base = list(map(lambda x: os.path.abspath(x), maybe_inspect_zip(models)))
-    base.sort(cmp=nsort)
+    base.sort(key=cmp_to_key(nsort))

    return base

@ -254,7 +255,7 @@ def setup_tempdir(dir, models, wav, alphabet, lm_binary, trie, binaries):
    extract_native_client_tarball(dir)

    filenames = map(lambda x: os.path.join(dir, os.path.basename(x)), sorted_models)
-    missing_models = filter(lambda x: not os.path.isfile(x), filenames)
+    missing_models = list(filter(lambda x: not os.path.isfile(x), filenames))
    if len(missing_models) > 0:
        # If we have a ZIP file, directly extract it to the proper path
        if is_zip_file(models):
@ -404,7 +405,7 @@ def run_benchmarks(dir, models, wav, alphabet, lm_binary=None, trie=None, iters=
            sys.stdout.flush()
            rc, stdout, stderr = exec_command(cmdline, cwd=dir)
            if rc == 0:
-                inference_time = float(stdout.split('\n')[1].split('=')[-1])
+                inference_time = float(stdout.split(b'\n')[1].split(b'=')[-1])
                # print("[%d] model=%s inference=%f" % (it, model, inference_time))
                current_model['iters'].append(inference_time)
            else:
--- a/bin/benchmark_plotter.py
+++ b/bin/benchmark_plotter.py
@ -39,7 +39,7 @@ def reduce_filename(f):

 def ingest_csv(datasets=None, range=None):
    existing_files = filter(lambda x: os.path.isfile(x[1]), datasets)
-    assert len(datasets) == len(existing_files)
+    assert len(list(datasets)) == len(list(existing_files))

    if range:
        range = map(int, range.split(','))
@ -79,7 +79,7 @@ def produce_plot_multiseries(input=None, output=None, title=None, size=None, fig
    fig.set_figwidth(float(size.split('x')[0]) / fig_dpi)
    fig.set_figheight(float(size.split('x')[1]) / fig_dpi)

-    nb_items = len(input[input.keys()[0]])
+    nb_items = len(input[list(input.keys())[0]])
    x_all    = list(range(nb_items))
    for serie, serie_values in iteritems(input):
        xtics  = list(map(lambda a: reduce_filename(a['model']), serie_values))
@ -119,7 +119,7 @@ def handle_args():
    parser.add_argument('--dataset', action='append', nargs=2, metavar=('name','source'),
                                help='Include dataset NAME from file SOURCE. Repeat the option to add more datasets.')
    parser.add_argument('--title', default=None, help='Title of the plot.')
-    parser.add_argument('--plot', type=argparse.FileType('w'), required=False,
+    parser.add_argument('--plot', type=argparse.FileType('wb'), required=False,
                                help='Target file where to plot data. Format will be deduced from extension.')
    parser.add_argument('--size', default='800x600',
                                help='Size (px) of the resulting plot.')
--- a/taskcluster/darwin-opt-base.tyml
+++ b/taskcluster/darwin-opt-base.tyml
@ -37,7 +37,7 @@ payload:

  env:
    $let:
-      training: { $eval: as_slugid("test-training_upstream-linux-amd64-py27mu-opt") }
+      training: { $eval: as_slugid("test-training_upstream-linux-amd64-py35m-opt") }
    in:
      TENSORFLOW_BUILD_ARTIFACT: ${build.tensorflow}
      DEEPSPEECH_TEST_MODEL: https://queue.taskcluster.net/v1/task/${training}/artifacts/public/output_graph.pb
--- a/taskcluster/linux-opt-base.tyml
+++ b/taskcluster/linux-opt-base.tyml
@ -34,7 +34,7 @@ then:

    env:
      $let:
-        training: { $eval: as_slugid("test-training_upstream-linux-amd64-py27mu-opt") }
+        training: { $eval: as_slugid("test-training_upstream-linux-amd64-py35m-opt") }
      in:
        TENSORFLOW_BUILD_ARTIFACT: ${build.tensorflow}
        DEEPSPEECH_TEST_MODEL: https://queue.taskcluster.net/v1/task/${training}/artifacts/public/output_graph.pb
--- a/taskcluster/test-android-opt-base.tyml
+++ b/taskcluster/test-android-opt-base.tyml
@ -31,7 +31,7 @@ then:

    env:
      $let:
-        training: { $eval: as_slugid("test-training_upstream-linux-amd64-py27mu-opt") }
+        training: { $eval: as_slugid("test-training_upstream-linux-amd64-py35m-opt") }
        android_arm64_build: { $eval: as_slugid("android-arm64-cpu-opt") }
        android_armv7_build: { $eval: as_slugid("android-armv7-cpu-opt") }
      in:
--- a/taskcluster/test-apk-android-24-x86_64-opt.yml
+++ b/taskcluster/test-apk-android-24-x86_64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-android-opt-base.tyml
  dependencies:
    - "android-x86_64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      apt-get -qq -y install curl make python && ${swig.packages.install_script}
--- a/taskcluster/test-apk-android-25-x86_64-opt.yml
+++ b/taskcluster/test-apk-android-25-x86_64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-android-opt-base.tyml
  dependencies:
    - "android-x86_64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      apt-get -qq -y install curl make python && ${swig.packages.install_script}
--- a/taskcluster/test-apk-android-26-x86_64-opt.yml.disabled
+++ b/taskcluster/test-apk-android-26-x86_64-opt.yml.disabled
@ -3,7 +3,7 @@ build:
  template_file: test-android-opt-base.tyml
  dependencies:
    - "android-x86_64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      apt-get -qq -y install curl make python && ${swig.packages.install_script}
--- a/taskcluster/test-apk-android-28-x86_64-opt.yml.disabled
+++ b/taskcluster/test-apk-android-28-x86_64-opt.yml.disabled
@ -3,7 +3,7 @@ build:
  template_file: test-android-opt-base.tyml
  dependencies:
    - "android-x86_64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      apt-get -qq -y install curl make python && ${swig.packages.install_script}
--- a/taskcluster/test-armbian-opt-base.tyml
+++ b/taskcluster/test-armbian-opt-base.tyml
@ -31,7 +31,7 @@ then:

    env:
      $let:
-        training: { $eval: as_slugid("test-training_upstream-linux-amd64-py27mu-opt") }
+        training: { $eval: as_slugid("test-training_upstream-linux-amd64-py35m-opt") }
        linux_arm64_build: { $eval: as_slugid("linux-arm64-cpu-opt") }
        node_package_cpu: { $eval: as_slugid("node-package-cpu") }
      in:
--- a/taskcluster/test-benchmark-linux-amd64-opt.yml
+++ b/taskcluster/test-benchmark-linux-amd64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-linux-opt-base.tyml
  dependencies:
    - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      apt-get -qq -y install ${python.packages_trusty.apt} zip
--- a/taskcluster/test-cpp-android-24-arm64-opt.yml
+++ b/taskcluster/test-cpp-android-24-arm64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-android-opt-base.tyml
  dependencies:
    - "android-arm64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  args:
    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-android-ds-tests.sh arm64-v8a android-24"
  metadata:
--- a/taskcluster/test-cpp-android-24-armv7-opt.yml
+++ b/taskcluster/test-cpp-android-24-armv7-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-android-opt-base.tyml
  dependencies:
    - "android-armv7-cpu-opt"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  args:
    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-android-ds-tests.sh armeabi-v7a android-24"
  metadata:
--- a/taskcluster/test-cpp-android-25-arm64-opt.yml
+++ b/taskcluster/test-cpp-android-25-arm64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-android-opt-base.tyml
  dependencies:
    - "android-arm64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  args:
    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-android-ds-tests.sh arm64-v8a android-25"
  metadata:
--- a/taskcluster/test-cpp-android-25-armv7-opt.yml
+++ b/taskcluster/test-cpp-android-25-armv7-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-android-opt-base.tyml
  dependencies:
    - "android-armv7-cpu-opt"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  args:
    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-android-ds-tests.sh armeabi-v7a android-25"
  metadata:
--- a/taskcluster/test-cpp-armbian-arm64-opt.yml
+++ b/taskcluster/test-cpp-armbian-arm64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-armbian-opt-base.tyml
  dependencies:
    - "linux-arm64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  args:
    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-cpp-ds-tests.sh"
  metadata:
--- a/taskcluster/test-cpp-darwin-amd64-opt.yml
+++ b/taskcluster/test-cpp-darwin-amd64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-darwin-opt-base.tyml
  dependencies:
    - "darwin-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${cpp.brew.setup} && ${cpp.brew.packages} && ${cpp.brew.env}
--- a/taskcluster/test-cpp-linux-amd64-opt.yml
+++ b/taskcluster/test-cpp-linux-amd64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-linux-opt-base.tyml
  dependencies:
    - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  args:
    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-cpp-ds-tests.sh"
  metadata:
--- a/taskcluster/test-cpp-raspbian-rpi3-opt.yml
+++ b/taskcluster/test-cpp-raspbian-rpi3-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-raspbian-opt-base.tyml
  dependencies:
    - "linux-rpi3-cpu-opt"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  args:
    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-cpp-ds-tests.sh"
  metadata:
--- a/taskcluster/test-cpp-win-amd64-opt.yml
+++ b/taskcluster/test-cpp-win-amd64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-win-opt-base.tyml
  dependencies:
    - "win-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  args:
    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/tc-cppwin-ds-tests.sh"
  metadata:
--- a/taskcluster/test-darwin-opt-base.tyml
+++ b/taskcluster/test-darwin-opt-base.tyml
@ -32,7 +32,7 @@ then:

    env:
      $let:
-        training: { $eval: as_slugid("test-training_upstream-linux-amd64-py27mu-opt") }
+        training: { $eval: as_slugid("test-training_upstream-linux-amd64-py35m-opt") }
        darwin_amd64_build: { $eval: as_slugid("darwin-amd64-cpu-opt") }
        node_package_cpu: { $eval: as_slugid("node-package-cpu") }
      in:
--- a/taskcluster/test-electronjs_v3.1-darwin-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v3.1-darwin-amd64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-darwin-opt-base.tyml
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${nodejs.brew.setup} && ${nodejs.brew.prep_10} && ${nodejs.brew.env}
--- a/taskcluster/test-electronjs_v3.1-linux-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v3.1-linux-amd64-opt.yml
@ -3,7 +3,7 @@ build:
  docker_image: "ubuntu:16.04"
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${nodejs.packages_xenial.prep_10} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt}
--- a/taskcluster/test-electronjs_v3.1-win-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v3.1-win-amd64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-win-opt-base.tyml
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${system.sox_win} && ${nodejs.win.prep_10}
--- a/taskcluster/test-electronjs_v4.0-darwin-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v4.0-darwin-amd64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-darwin-opt-base.tyml
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${nodejs.brew.setup} && ${nodejs.brew.prep_10} && ${nodejs.brew.env}
--- a/taskcluster/test-electronjs_v4.0-linux-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v4.0-linux-amd64-opt.yml
@ -3,7 +3,7 @@ build:
  docker_image: "ubuntu:16.04"
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${nodejs.packages_xenial.prep_10} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt}
--- a/taskcluster/test-electronjs_v4.0-win-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v4.0-win-amd64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-win-opt-base.tyml
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${system.sox_win} && ${nodejs.win.prep_10}
--- a/taskcluster/test-electronjs_v4.1-darwin-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v4.1-darwin-amd64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-darwin-opt-base.tyml
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${nodejs.brew.setup} && ${nodejs.brew.prep_10} && ${nodejs.brew.env}
--- a/taskcluster/test-electronjs_v4.1-linux-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v4.1-linux-amd64-opt.yml
@ -3,7 +3,7 @@ build:
  docker_image: "ubuntu:16.04"
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${nodejs.packages_xenial.prep_10} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt}
--- a/taskcluster/test-electronjs_v4.1-win-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v4.1-win-amd64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-win-opt-base.tyml
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${system.sox_win} && ${nodejs.win.prep_10}
--- a/taskcluster/test-electronjs_v5.0-darwin-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v5.0-darwin-amd64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-darwin-opt-base.tyml
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${nodejs.brew.setup} && ${nodejs.brew.prep_12} && ${nodejs.brew.env}
--- a/taskcluster/test-electronjs_v5.0-linux-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v5.0-linux-amd64-opt.yml
@ -3,7 +3,7 @@ build:
  docker_image: "ubuntu:16.04"
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt}
--- a/taskcluster/test-electronjs_v5.0-win-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v5.0-win-amd64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-win-opt-base.tyml
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${system.sox_win} && ${nodejs.win.prep_12}
--- a/taskcluster/test-linux-opt-base.tyml
+++ b/taskcluster/test-linux-opt-base.tyml
@ -31,7 +31,7 @@ then:

    env:
      $let:
-        training: { $eval: as_slugid("test-training_upstream-linux-amd64-py27mu-opt") }
+        training: { $eval: as_slugid("test-training_upstream-linux-amd64-py35m-opt") }
        linux_amd64_build: { $eval: as_slugid("linux-amd64-cpu-opt") }
        linux_amd64_ctc: { $eval: as_slugid("linux-amd64-ctc-opt") }
        node_package_cpu: { $eval: as_slugid("node-package-cpu") }
--- a/taskcluster/test-lite_benchmark_model-linux-amd64-opt.yml
+++ b/taskcluster/test-lite_benchmark_model-linux-amd64-opt.yml
@ -1,7 +1,7 @@
 build:
  template_file: test-linux-opt-base.tyml
  dependencies:
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  args:
    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-lite_benchmark_model-ds-tests.sh"
  benchmark_model_bin: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.13.3e0cc5374d6f4a0cc1e1c14e7a185296fe23ea4b.cpu/artifacts/public/lite_benchmark_model"
--- a/taskcluster/test-netframework-win-amd64-opt.yml
+++ b/taskcluster/test-netframework-win-amd64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-win-opt-base.tyml
  dependencies:
    - "win-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  args:
    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/tc-netframework-ds-tests.sh"
  metadata:
--- a/taskcluster/test-nodejs_10x-armbian-arm64-opt.yml
+++ b/taskcluster/test-nodejs_10x-armbian-arm64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-armbian-opt-base.tyml
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${nodejs.packages_stretch.prep_10} && ${nodejs.packages_stretch.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_stretch.apt}
--- a/taskcluster/test-nodejs_10x-darwin-amd64-opt.yml
+++ b/taskcluster/test-nodejs_10x-darwin-amd64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-darwin-opt-base.tyml
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${nodejs.brew.setup} && ${nodejs.brew.prep_10} && ${nodejs.brew.env}
--- a/taskcluster/test-nodejs_10x-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_10x-linux-amd64-opt.yml
@ -3,7 +3,7 @@ build:
  docker_image: "ubuntu:16.04"
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${nodejs.packages_xenial.prep_10} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
--- a/taskcluster/test-nodejs_10x-raspbian-rpi3-opt.yml
+++ b/taskcluster/test-nodejs_10x-raspbian-rpi3-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-raspbian-opt-base.tyml
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${nodejs.packages_stretch.prep_10} && ${nodejs.packages_stretch.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_stretch.apt}
--- a/taskcluster/test-nodejs_10x-win-amd64-opt.yml
+++ b/taskcluster/test-nodejs_10x-win-amd64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-win-opt-base.tyml
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${system.sox_win} && ${nodejs.win.prep_10}
--- a/taskcluster/test-nodejs_11x-armbian-arm64-opt.yml
+++ b/taskcluster/test-nodejs_11x-armbian-arm64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-armbian-opt-base.tyml
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${nodejs.packages_stretch.prep_11} && ${nodejs.packages_stretch.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_stretch.apt}
--- a/taskcluster/test-nodejs_11x-darwin-amd64-opt.yml
+++ b/taskcluster/test-nodejs_11x-darwin-amd64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-darwin-opt-base.tyml
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${nodejs.brew.setup} && ${nodejs.brew.prep_11} && ${nodejs.brew.env}
--- a/taskcluster/test-nodejs_11x-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_11x-linux-amd64-opt.yml
@ -3,7 +3,7 @@ build:
  docker_image: "ubuntu:16.04"
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${nodejs.packages_xenial.prep_11} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
--- a/taskcluster/test-nodejs_11x-raspbian-rpi3-opt.yml
+++ b/taskcluster/test-nodejs_11x-raspbian-rpi3-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-raspbian-opt-base.tyml
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${nodejs.packages_stretch.prep_11} && ${nodejs.packages_stretch.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_stretch.apt}
--- a/taskcluster/test-nodejs_11x-win-amd64-opt.yml
+++ b/taskcluster/test-nodejs_11x-win-amd64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-win-opt-base.tyml
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${system.sox_win} && ${nodejs.win.prep_11}
--- a/taskcluster/test-nodejs_12x-armbian-arm64-opt.yml
+++ b/taskcluster/test-nodejs_12x-armbian-arm64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-armbian-opt-base.tyml
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${nodejs.packages_stretch.prep_12} && ${nodejs.packages_stretch.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_stretch.apt}
--- a/taskcluster/test-nodejs_12x-darwin-amd64-opt.yml
+++ b/taskcluster/test-nodejs_12x-darwin-amd64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-darwin-opt-base.tyml
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${nodejs.brew.setup} && ${nodejs.brew.prep_12} && ${nodejs.brew.env}
--- a/taskcluster/test-nodejs_12x-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_12x-linux-amd64-opt.yml
@ -3,7 +3,7 @@ build:
  docker_image: "ubuntu:16.04"
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
--- a/taskcluster/test-nodejs_12x-raspbian-rpi3-opt.yml
+++ b/taskcluster/test-nodejs_12x-raspbian-rpi3-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-raspbian-opt-base.tyml
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${nodejs.packages_stretch.prep_12} && ${nodejs.packages_stretch.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_stretch.apt}
--- a/taskcluster/test-nodejs_12x-win-amd64-opt.yml
+++ b/taskcluster/test-nodejs_12x-win-amd64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-win-opt-base.tyml
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${system.sox_win} && ${nodejs.win.prep_12}
--- a/taskcluster/test-nodejs_4x-armbian-arm64-opt.yml
+++ b/taskcluster/test-nodejs_4x-armbian-arm64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-armbian-opt-base.tyml
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${nodejs.packages_stretch.prep_4} && ${nodejs.packages_stretch.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_stretch.apt}
--- a/taskcluster/test-nodejs_4x-darwin-amd64-opt.yml
+++ b/taskcluster/test-nodejs_4x-darwin-amd64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-darwin-opt-base.tyml
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${nodejs.brew.setup} && ${nodejs.brew.prep_4} && ${nodejs.brew.env}
--- a/taskcluster/test-nodejs_4x-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_4x-linux-amd64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-linux-opt-base.tyml
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${nodejs.packages_trusty.prep_4} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt}
--- a/taskcluster/test-nodejs_4x-raspbian-rpi3-opt.yml
+++ b/taskcluster/test-nodejs_4x-raspbian-rpi3-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-raspbian-opt-base.tyml
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${nodejs.packages_stretch.prep_4} && ${nodejs.packages_stretch.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_stretch.apt}
--- a/taskcluster/test-nodejs_4x-win-amd64-opt.yml
+++ b/taskcluster/test-nodejs_4x-win-amd64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-win-opt-base.tyml
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${system.sox_win} && ${nodejs.win.prep_4}
--- a/taskcluster/test-nodejs_5x-armbian-arm64-opt.yml-disabled
+++ b/taskcluster/test-nodejs_5x-armbian-arm64-opt.yml-disabled
@ -2,7 +2,7 @@ build:
  template_file: test-armbian-opt-base.tyml
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${nodejs.packages_stretch.prep_5} && ${nodejs.packages_stretch.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_stretch.apt}
--- a/taskcluster/test-nodejs_5x-darwin-amd64-opt.yml
+++ b/taskcluster/test-nodejs_5x-darwin-amd64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-darwin-opt-base.tyml
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${nodejs.brew.setup} && ${nodejs.brew.prep_5} && ${nodejs.brew.env}
--- a/taskcluster/test-nodejs_5x-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_5x-linux-amd64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-linux-opt-base.tyml
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${nodejs.packages_trusty.prep_5} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt}
--- a/taskcluster/test-nodejs_5x-raspbian-rpi3-opt.yml-disabled
+++ b/taskcluster/test-nodejs_5x-raspbian-rpi3-opt.yml-disabled
@ -2,7 +2,7 @@ build:
  template_file: test-raspbian-opt-base.tyml
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${nodejs.packages_stretch.prep_5} && ${nodejs.packages_stretch.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_stretch.apt}
--- a/taskcluster/test-nodejs_6x-armbian-arm64-opt.yml
+++ b/taskcluster/test-nodejs_6x-armbian-arm64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-armbian-opt-base.tyml
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${nodejs.packages_stretch.prep_6} && ${nodejs.packages_stretch.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_stretch.apt}
--- a/taskcluster/test-nodejs_6x-darwin-amd64-opt.yml
+++ b/taskcluster/test-nodejs_6x-darwin-amd64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-darwin-opt-base.tyml
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${nodejs.brew.setup} && ${nodejs.brew.prep_6} && ${nodejs.brew.env}
--- a/taskcluster/test-nodejs_6x-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_6x-linux-amd64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-linux-opt-base.tyml
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${nodejs.packages_trusty.prep_6} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt}
--- a/taskcluster/test-nodejs_6x-raspbian-rpi3-opt.yml
+++ b/taskcluster/test-nodejs_6x-raspbian-rpi3-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-raspbian-opt-base.tyml
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${nodejs.packages_stretch.prep_6} && ${nodejs.packages_stretch.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_stretch.apt}
--- a/taskcluster/test-nodejs_6x-win-amd64-opt.yml
+++ b/taskcluster/test-nodejs_6x-win-amd64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-win-opt-base.tyml
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${system.sox_win} && ${nodejs.win.prep_6}
--- a/taskcluster/test-nodejs_7x-armbian-arm64-opt.yml
+++ b/taskcluster/test-nodejs_7x-armbian-arm64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-armbian-opt-base.tyml
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${nodejs.packages_stretch.prep_7} && ${nodejs.packages_stretch.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_stretch.apt}
--- a/taskcluster/test-nodejs_7x-darwin-amd64-opt.yml
+++ b/taskcluster/test-nodejs_7x-darwin-amd64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-darwin-opt-base.tyml
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${nodejs.brew.setup} && ${nodejs.brew.prep_7} && ${nodejs.brew.env}
--- a/taskcluster/test-nodejs_7x-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_7x-linux-amd64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-linux-opt-base.tyml
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${nodejs.packages_trusty.prep_7} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt}
--- a/taskcluster/test-nodejs_7x-raspbian-rpi3-opt.yml
+++ b/taskcluster/test-nodejs_7x-raspbian-rpi3-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-raspbian-opt-base.tyml
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${nodejs.packages_stretch.prep_7} && ${nodejs.packages_stretch.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_stretch.apt}
--- a/taskcluster/test-nodejs_7x-win-amd64-opt.yml
+++ b/taskcluster/test-nodejs_7x-win-amd64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-win-opt-base.tyml
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${system.sox_win} && ${nodejs.win.prep_7}
--- a/taskcluster/test-nodejs_8x-armbian-arm64-opt.yml
+++ b/taskcluster/test-nodejs_8x-armbian-arm64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-armbian-opt-base.tyml
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${nodejs.packages_stretch.prep_8} && ${nodejs.packages_stretch.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_stretch.apt}
--- a/taskcluster/test-nodejs_8x-darwin-amd64-opt.yml
+++ b/taskcluster/test-nodejs_8x-darwin-amd64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-darwin-opt-base.tyml
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${nodejs.brew.setup} && ${nodejs.brew.prep_8} && ${nodejs.brew.env}
--- a/taskcluster/test-nodejs_8x-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_8x-linux-amd64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-linux-opt-base.tyml
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${nodejs.packages_trusty.prep_8} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt}
--- a/taskcluster/test-nodejs_8x-raspbian-rpi3-opt.yml
+++ b/taskcluster/test-nodejs_8x-raspbian-rpi3-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-raspbian-opt-base.tyml
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${nodejs.packages_stretch.prep_8} && ${nodejs.packages_stretch.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_stretch.apt}
--- a/taskcluster/test-nodejs_8x-win-amd64-opt.yml
+++ b/taskcluster/test-nodejs_8x-win-amd64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-win-opt-base.tyml
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${system.sox_win} && ${nodejs.win.prep_8}
--- a/taskcluster/test-nodejs_9x-armbian-arm64-opt.yml
+++ b/taskcluster/test-nodejs_9x-armbian-arm64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-armbian-opt-base.tyml
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${nodejs.packages_stretch.prep_9} && ${nodejs.packages_stretch.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_stretch.apt}
--- a/taskcluster/test-nodejs_9x-darwin-amd64-opt.yml
+++ b/taskcluster/test-nodejs_9x-darwin-amd64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-darwin-opt-base.tyml
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${nodejs.brew.setup} && ${nodejs.brew.prep_9} && ${nodejs.brew.env}
--- a/taskcluster/test-nodejs_9x-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_9x-linux-amd64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-linux-opt-base.tyml
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${nodejs.packages_trusty.prep_9} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt}
--- a/taskcluster/test-nodejs_9x-raspbian-rpi3-opt.yml
+++ b/taskcluster/test-nodejs_9x-raspbian-rpi3-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-raspbian-opt-base.tyml
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${nodejs.packages_stretch.prep_9} && ${nodejs.packages_stretch.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_stretch.apt}
--- a/taskcluster/test-nodejs_9x-win-amd64-opt.yml
+++ b/taskcluster/test-nodejs_9x-win-amd64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-win-opt-base.tyml
  dependencies:
    - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${system.sox_win} && ${nodejs.win.prep_9}
--- a/taskcluster/test-python_27m-darwin-amd64-opt.yml
+++ b/taskcluster/test-python_27m-darwin-amd64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-darwin-opt-base.tyml
  dependencies:
    - "darwin-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${python.brew.setup} && ${python.brew.env}
--- a/taskcluster/test-python_27m-linux-amd64-opt.yml
+++ b/taskcluster/test-python_27m-linux-amd64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-linux-opt-base.tyml
  dependencies:
    - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      apt-get -qq -y install ${python.packages_trusty.apt}
--- a/taskcluster/test-python_27mu-linux-amd64-opt.yml
+++ b/taskcluster/test-python_27mu-linux-amd64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-linux-opt-base.tyml
  dependencies:
    - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      apt-get -qq -y install ${python.packages_trusty.apt}
--- a/taskcluster/test-python_34m-armbian-arm64-opt.yml-disabled
+++ b/taskcluster/test-python_34m-armbian-arm64-opt.yml-disabled
@ -2,7 +2,7 @@ build:
  template_file: test-armbian-opt-base.tyml
  dependencies:
    - "linux-arm64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      apt-get -qq -y install ${python.packages_stretch.apt}
--- a/taskcluster/test-python_34m-darwin-amd64-opt.yml
+++ b/taskcluster/test-python_34m-darwin-amd64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-darwin-opt-base.tyml
  dependencies:
    - "darwin-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${python.brew.setup} && ${python.brew.env}
--- a/taskcluster/test-python_34m-linux-amd64-opt.yml
+++ b/taskcluster/test-python_34m-linux-amd64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-linux-opt-base.tyml
  dependencies:
    - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      apt-get -qq -y install ${python.packages_trusty.apt}
--- a/taskcluster/test-python_34m-raspbian-rpi3-opt.yml
+++ b/taskcluster/test-python_34m-raspbian-rpi3-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-raspbian-opt-base.tyml
  dependencies:
    - "linux-rpi3-cpu-opt"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      apt-get -qq -y install ${python.packages_stretch.apt}
--- a/taskcluster/test-python_35-darwin-amd64-opt.yml
+++ b/taskcluster/test-python_35-darwin-amd64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-darwin-opt-base.tyml
  dependencies:
    - "darwin-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${python.brew.setup} && ${python.brew.env}
--- a/taskcluster/test-python_35-linux-amd64-opt.yml
+++ b/taskcluster/test-python_35-linux-amd64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-linux-opt-base.tyml
  dependencies:
    - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      apt-get -qq -y install ${python.packages_trusty.apt}
--- a/taskcluster/test-python_35-win-amd64-opt.yml
+++ b/taskcluster/test-python_35-win-amd64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-win-opt-base.tyml
  dependencies:
    - "win-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${system.sox_win}
--- a/taskcluster/test-python_35m-armbian-arm64-opt.yml
+++ b/taskcluster/test-python_35m-armbian-arm64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-armbian-opt-base.tyml
  dependencies:
    - "linux-arm64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      apt-get -qq -y install ${python.packages_stretch.apt}
--- a/taskcluster/test-python_35m-raspbian-rpi3-opt.yml
+++ b/taskcluster/test-python_35m-raspbian-rpi3-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-raspbian-opt-base.tyml
  dependencies:
    - "linux-rpi3-cpu-opt"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      apt-get -qq -y install ${python.packages_stretch.apt}
--- a/taskcluster/test-python_36-darwin-amd64-opt.yml
+++ b/taskcluster/test-python_36-darwin-amd64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-darwin-opt-base.tyml
  dependencies:
    - "darwin-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${python.brew.setup} && ${python.brew.env}
--- a/taskcluster/test-python_36-linux-amd64-opt.yml
+++ b/taskcluster/test-python_36-linux-amd64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-linux-opt-base.tyml
  dependencies:
    - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
       apt-get -qq -y install ${python.packages_trusty.apt}
--- a/taskcluster/test-python_36-win-amd64-opt.yml
+++ b/taskcluster/test-python_36-win-amd64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-win-opt-base.tyml
  dependencies:
    - "win-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${system.sox_win}
--- a/taskcluster/test-python_37-darwin-amd64-opt.yml
+++ b/taskcluster/test-python_37-darwin-amd64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-darwin-opt-base.tyml
  dependencies:
    - "darwin-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${python.brew.setup} && ${python.brew.env}
--- a/taskcluster/test-python_37-linux-amd64-opt.yml
+++ b/taskcluster/test-python_37-linux-amd64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-linux-opt-base.tyml
  dependencies:
    - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      apt-get -qq -y install ${python.packages_trusty.apt}
--- a/taskcluster/test-python_37-win-amd64-opt.yml
+++ b/taskcluster/test-python_37-win-amd64-opt.yml
@ -2,7 +2,7 @@ build:
  template_file: test-win-opt-base.tyml
  dependencies:
    - "win-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py27mu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
  system_setup:
    >
      ${system.sox_win}
--- a/taskcluster/test-raspbian-opt-base.tyml
+++ b/taskcluster/test-raspbian-opt-base.tyml
@ -31,7 +31,7 @@ then:

    env:
      $let:
-        training: { $eval: as_slugid("test-training_upstream-linux-amd64-py27mu-opt") }
+        training: { $eval: as_slugid("test-training_upstream-linux-amd64-py35m-opt") }
        linux_rpi3_build: { $eval: as_slugid("linux-rpi3-cpu-opt") }
        node_package_cpu: { $eval: as_slugid("node-package-cpu") }
      in:
--- a/taskcluster/test-training_upstream-linux-amd64-py27mu-opt.yml
+++ b/taskcluster/test-training_upstream-linux-amd64-py27mu-opt.yml
@ -1,13 +0,0 @@
-build:
-  template_file: test-linux-opt-base.tyml
-  dependencies:
-    - "linux-amd64-ctc-opt"
-  system_setup:
-    >
-      apt-get -qq -y install ${python.packages_trusty.apt}
-  args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-train-tests.sh 2.7.14:mu"
-  convert_graphdef: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.13.3e0cc5374d6f4a0cc1e1c14e7a185296fe23ea4b.cpu/artifacts/public/convert_graphdef_memmapped_format"
-  metadata:
-    name: "DeepSpeech Linux AMD64 CPU upstream training Py2.7 mu"
-    description: "Training a DeepSpeech LDC93S1 model for Linux/AMD64 using upstream TensorFlow Python 2.7 mu, CPU only, optimized version"
--- a/Показать больше
+++ b/Показать больше