From a45706c40da79fb00717102820640f7edb8aa61b Mon Sep 17 00:00:00 2001
From: Reuben Morais <reuben.morais@gmail.com>
Date: Tue, 3 Dec 2019 15:57:52 +0100
Subject: [PATCH] Drop support for Python 3.4 as it is EOL and no longer builds
 on macOS

---
 taskcluster/tc-tests-utils.sh                       |  2 +-
 taskcluster/test-python_34m-darwin-amd64-opt.yml    | 13 -------------
 taskcluster/test-python_34m-linux-amd64-opt.yml     | 13 -------------
 ...test-python_34m-linux-amd64-prod_pbmodel-opt.yml | 12 ------------
 4 files changed, 1 insertion(+), 39 deletions(-)
 delete mode 100644 taskcluster/test-python_34m-darwin-amd64-opt.yml
 delete mode 100644 taskcluster/test-python_34m-linux-amd64-opt.yml
 delete mode 100644 taskcluster/test-python_34m-linux-amd64-prod_pbmodel-opt.yml

diff --git a/taskcluster/tc-tests-utils.sh b/taskcluster/tc-tests-utils.sh
index 63b95bda..2cacaa43 100755
--- a/taskcluster/tc-tests-utils.sh
+++ b/taskcluster/tc-tests-utils.sh
@@ -55,7 +55,7 @@ model_name="$(basename "${model_source}")"
 model_name_mmap="$(basename -s ".pb" "${model_source}").pbmm"
 model_source_mmap="$(dirname "${model_source}")/${model_name_mmap}"
 
-SUPPORTED_PYTHON_VERSIONS=${SUPPORTED_PYTHON_VERSIONS:-2.7.16:ucs2 2.7.16:ucs4 3.4.10:ucs4 3.5.7:ucs4 3.6.8:ucs4 3.7.3:ucs4 3.8.0:ucs4}
+SUPPORTED_PYTHON_VERSIONS=${SUPPORTED_PYTHON_VERSIONS:-2.7.16:ucs2 2.7.16:ucs4 3.5.7:ucs4 3.6.8:ucs4 3.7.3:ucs4 3.8.0:ucs4}
 SUPPORTED_NODEJS_VERSIONS=${SUPPORTED_NODEJS_VERSIONS:-4.9.1 5.12.0 6.17.1 7.10.1 8.16.0 9.11.2 10.16.0 11.15.0 12.5.0 13.0.1}
 SUPPORTED_ELECTRONJS_VERSIONS=${SUPPORTED_ELECTRONJS_VERSIONS:-1.6.18 1.7.16 1.8.8 2.0.18 3.0.16 3.1.11 4.0.3 4.1.5 4.2.5 5.0.6 6.0.11 7.0.1 7.1.2}
 
diff --git a/taskcluster/test-python_34m-darwin-amd64-opt.yml b/taskcluster/test-python_34m-darwin-amd64-opt.yml
deleted file mode 100644
index df79734f..00000000
--- a/taskcluster/test-python_34m-darwin-amd64-opt.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-build:
-  template_file: test-darwin-opt-base.tyml
-  dependencies:
-    - "darwin-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
-  system_setup:
-    >
-      ${python.brew.setup} && ${python.brew.env}
-  args:
-    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.4.8:m"
-  metadata:
-    name: "DeepSpeech OSX AMD64 CPU Python v3.4 tests"
-    description: "Testing DeepSpeech for OSX/AMD64 on Python v3.4, CPU only, optimized version"
diff --git a/taskcluster/test-python_34m-linux-amd64-opt.yml b/taskcluster/test-python_34m-linux-amd64-opt.yml
deleted file mode 100644
index c86f0509..00000000
--- a/taskcluster/test-python_34m-linux-amd64-opt.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-build:
-  template_file: test-linux-opt-base.tyml
-  dependencies:
-    - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
-  system_setup:
-    >
-      apt-get -qq -y install ${python.packages_trusty.apt}
-  args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.4.8:m"
-  metadata:
-    name: "DeepSpeech Linux AMD64 CPU Python v3.4 tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on Python v3.4, CPU only, optimized version"
diff --git a/taskcluster/test-python_34m-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-python_34m-linux-amd64-prod_pbmodel-opt.yml
deleted file mode 100644
index 00caa8a7..00000000
--- a/taskcluster/test-python_34m-linux-amd64-prod_pbmodel-opt.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-build:
-  template_file: test-linux-opt-base.tyml
-  dependencies:
-    - "linux-amd64-cpu-opt"
-  system_setup:
-    >
-      apt-get -qq -y install ${python.packages_trusty.apt}
-  args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests-prod.sh 3.4.8:m"
-  metadata:
-    name: "DeepSpeech Linux AMD64 CPU Python v3.4 prod tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on Python v3.4 on prod model, CPU only, optimized version"