From 197704b86886be8ee88308f57a9e49a144acb271 Mon Sep 17 00:00:00 2001 From: Alexandre Lissy Date: Mon, 13 Jan 2020 10:31:41 +0100 Subject: [PATCH] Remove Python 2.7 Fixes #2659 --- taskcluster/tc-tests-utils.sh | 4 ++-- taskcluster/test-python_27m-darwin-amd64-opt.yml | 14 -------------- .../test-python_27m_16k-linux-amd64-opt.yml | 14 -------------- ...python_27m_16k-linux-amd64-prod_pbmodel-opt.yml | 12 ------------ taskcluster/test-python_27m_8k-linux-amd64-opt.yml | 14 -------------- ...-python_27m_8k-linux-amd64-prod_pbmodel-opt.yml | 12 ------------ ...-python_27m_tflite_16k-linux-amd64-prod-opt.yml | 12 ------------ ...t-python_27m_tflite_8k-linux-amd64-prod-opt.yml | 12 ------------ .../test-python_27mu_16k-linux-amd64-opt.yml | 14 -------------- ...ython_27mu_16k-linux-amd64-prod_pbmodel-opt.yml | 12 ------------ .../test-python_27mu_8k-linux-amd64-opt.yml | 14 -------------- ...python_27mu_8k-linux-amd64-prod_pbmodel-opt.yml | 12 ------------ ...python_27mu_tflite_16k-linux-amd64-prod-opt.yml | 12 ------------ ...-python_27mu_tflite_8k-linux-amd64-prod-opt.yml | 12 ------------ 14 files changed, 2 insertions(+), 168 deletions(-) delete mode 100644 taskcluster/test-python_27m-darwin-amd64-opt.yml delete mode 100644 taskcluster/test-python_27m_16k-linux-amd64-opt.yml delete mode 100644 taskcluster/test-python_27m_16k-linux-amd64-prod_pbmodel-opt.yml delete mode 100644 taskcluster/test-python_27m_8k-linux-amd64-opt.yml delete mode 100644 taskcluster/test-python_27m_8k-linux-amd64-prod_pbmodel-opt.yml delete mode 100644 taskcluster/test-python_27m_tflite_16k-linux-amd64-prod-opt.yml delete mode 100644 taskcluster/test-python_27m_tflite_8k-linux-amd64-prod-opt.yml delete mode 100644 taskcluster/test-python_27mu_16k-linux-amd64-opt.yml delete mode 100644 taskcluster/test-python_27mu_16k-linux-amd64-prod_pbmodel-opt.yml delete mode 100644 taskcluster/test-python_27mu_8k-linux-amd64-opt.yml delete mode 100644 taskcluster/test-python_27mu_8k-linux-amd64-prod_pbmodel-opt.yml delete mode 100644 taskcluster/test-python_27mu_tflite_16k-linux-amd64-prod-opt.yml delete mode 100644 taskcluster/test-python_27mu_tflite_8k-linux-amd64-prod-opt.yml diff --git a/taskcluster/tc-tests-utils.sh b/taskcluster/tc-tests-utils.sh index 49ab0fb5..91a7ec1d 100755 --- a/taskcluster/tc-tests-utils.sh +++ b/taskcluster/tc-tests-utils.sh @@ -58,7 +58,7 @@ model_source_mmap="$(dirname "${model_source}")/${model_name_mmap}" ldc93s1_sample_filename='' -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_PYTHON_VERSIONS=${SUPPORTED_PYTHON_VERSIONS:-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} @@ -1219,7 +1219,7 @@ extract_python_versions() local _pyver=$(echo "${_pyver_full}" | cut -d':' -f1) - # 2.7.x => 27 + # 3.8.x => 38 local _pyver_pkg=$(echo "${_pyver}" | cut -d'.' -f1,2 | tr -d '.') # UCS2 => narrow unicode diff --git a/taskcluster/test-python_27m-darwin-amd64-opt.yml b/taskcluster/test-python_27m-darwin-amd64-opt.yml deleted file mode 100644 index f4182aac..00000000 --- a/taskcluster/test-python_27m-darwin-amd64-opt.yml +++ /dev/null @@ -1,14 +0,0 @@ -build: - template_file: test-darwin-opt-base.tyml - dependencies: - - "darwin-amd64-cpu-opt" - - "test-training_16k-linux-amd64-py36m-opt" - test_model_task: "test-training_16k-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 2.7.14:m 16k" - metadata: - name: "DeepSpeech OSX AMD64 CPU Python v2.7 m tests" - description: "Testing DeepSpeech for OSX/AMD64 on Python v2.7 m, CPU only, optimized version" diff --git a/taskcluster/test-python_27m_16k-linux-amd64-opt.yml b/taskcluster/test-python_27m_16k-linux-amd64-opt.yml deleted file mode 100644 index b6898e1c..00000000 --- a/taskcluster/test-python_27m_16k-linux-amd64-opt.yml +++ /dev/null @@ -1,14 +0,0 @@ -build: - template_file: test-linux-opt-base.tyml - dependencies: - - "linux-amd64-cpu-opt" - - "test-training_16k-linux-amd64-py36m-opt" - test_model_task: "test-training_16k-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 2.7.14:m 16k" - metadata: - name: "DeepSpeech Linux AMD64 CPU Python v2.7 m tests (16kHz)" - description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7 m, CPU only, optimized version (16kHz)" diff --git a/taskcluster/test-python_27m_16k-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-python_27m_16k-linux-amd64-prod_pbmodel-opt.yml deleted file mode 100644 index 94caf55e..00000000 --- a/taskcluster/test-python_27m_16k-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 2.7.14:m 16k" - metadata: - name: "DeepSpeech Linux AMD64 CPU Python v2.7 m prod tests (16kHz)" - description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7 m on prod model, CPU only, optimized version (16kHz)" diff --git a/taskcluster/test-python_27m_8k-linux-amd64-opt.yml b/taskcluster/test-python_27m_8k-linux-amd64-opt.yml deleted file mode 100644 index be082a27..00000000 --- a/taskcluster/test-python_27m_8k-linux-amd64-opt.yml +++ /dev/null @@ -1,14 +0,0 @@ -build: - template_file: test-linux-opt-base.tyml - dependencies: - - "linux-amd64-cpu-opt" - - "test-training_8k-linux-amd64-py36m-opt" - test_model_task: "test-training_8k-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 2.7.14:m 8k" - metadata: - name: "DeepSpeech Linux AMD64 CPU Python v2.7 m tests (8kHz)" - description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7 m, CPU only, optimized version (8kHz)" diff --git a/taskcluster/test-python_27m_8k-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-python_27m_8k-linux-amd64-prod_pbmodel-opt.yml deleted file mode 100644 index c49f1dd3..00000000 --- a/taskcluster/test-python_27m_8k-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 2.7.14:m 8k" - metadata: - name: "DeepSpeech Linux AMD64 CPU Python v2.7 m prod tests (8kHz)" - description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7 m on prod model, CPU only, optimized version (8kHz)" diff --git a/taskcluster/test-python_27m_tflite_16k-linux-amd64-prod-opt.yml b/taskcluster/test-python_27m_tflite_16k-linux-amd64-prod-opt.yml deleted file mode 100644 index b9479703..00000000 --- a/taskcluster/test-python_27m_tflite_16k-linux-amd64-prod-opt.yml +++ /dev/null @@ -1,12 +0,0 @@ -build: - template_file: test-linux-opt-base.tyml - dependencies: - - "linux-amd64-tflite-opt" - system_setup: - > - apt-get -qq -y install ${python.packages_trusty.apt} - args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests-prod.sh 2.7.14:m 16k" - metadata: - name: "DeepSpeech Linux AMD64 TFLite Python v2.7 m prod tests (16kHz)" - description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7 m on prod model, TFLite, optimized version (16kHz)" diff --git a/taskcluster/test-python_27m_tflite_8k-linux-amd64-prod-opt.yml b/taskcluster/test-python_27m_tflite_8k-linux-amd64-prod-opt.yml deleted file mode 100644 index 92c250ca..00000000 --- a/taskcluster/test-python_27m_tflite_8k-linux-amd64-prod-opt.yml +++ /dev/null @@ -1,12 +0,0 @@ -build: - template_file: test-linux-opt-base.tyml - dependencies: - - "linux-amd64-tflite-opt" - system_setup: - > - apt-get -qq -y install ${python.packages_trusty.apt} - args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests-prod.sh 2.7.14:m 8k" - metadata: - name: "DeepSpeech Linux AMD64 TFLite Python v2.7 m prod tests (8kHz)" - description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7 m on prod model, TFLite, optimized version (8kHz)" diff --git a/taskcluster/test-python_27mu_16k-linux-amd64-opt.yml b/taskcluster/test-python_27mu_16k-linux-amd64-opt.yml deleted file mode 100644 index dfbf991e..00000000 --- a/taskcluster/test-python_27mu_16k-linux-amd64-opt.yml +++ /dev/null @@ -1,14 +0,0 @@ -build: - template_file: test-linux-opt-base.tyml - dependencies: - - "linux-amd64-cpu-opt" - - "test-training_16k-linux-amd64-py36m-opt" - test_model_task: "test-training_16k-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 2.7.14:mu 16k" - metadata: - name: "DeepSpeech Linux AMD64 CPU Python v2.7 mu tests (16kHz)" - description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7 mu, CPU only, optimized version (16kHz)" diff --git a/taskcluster/test-python_27mu_16k-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-python_27mu_16k-linux-amd64-prod_pbmodel-opt.yml deleted file mode 100644 index ac553668..00000000 --- a/taskcluster/test-python_27mu_16k-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 2.7.14:mu 16k" - metadata: - name: "DeepSpeech Linux AMD64 CPU Python v2.7 mu prod tests (16kHz)" - description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7 mu on prod model, CPU only, optimized version (16kHz)" diff --git a/taskcluster/test-python_27mu_8k-linux-amd64-opt.yml b/taskcluster/test-python_27mu_8k-linux-amd64-opt.yml deleted file mode 100644 index a346c71f..00000000 --- a/taskcluster/test-python_27mu_8k-linux-amd64-opt.yml +++ /dev/null @@ -1,14 +0,0 @@ -build: - template_file: test-linux-opt-base.tyml - dependencies: - - "linux-amd64-cpu-opt" - - "test-training_8k-linux-amd64-py36m-opt" - test_model_task: "test-training_8k-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 2.7.14:mu 8k" - metadata: - name: "DeepSpeech Linux AMD64 CPU Python v2.7 mu tests (8kHz)" - description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7 mu, CPU only, optimized version (8kHz)" diff --git a/taskcluster/test-python_27mu_8k-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-python_27mu_8k-linux-amd64-prod_pbmodel-opt.yml deleted file mode 100644 index c584fddc..00000000 --- a/taskcluster/test-python_27mu_8k-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 2.7.14:mu 8k" - metadata: - name: "DeepSpeech Linux AMD64 CPU Python v2.7 mu prod tests (8kHz)" - description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7 mu on prod model, CPU only, optimized version (8kHz)" diff --git a/taskcluster/test-python_27mu_tflite_16k-linux-amd64-prod-opt.yml b/taskcluster/test-python_27mu_tflite_16k-linux-amd64-prod-opt.yml deleted file mode 100644 index 275e45a9..00000000 --- a/taskcluster/test-python_27mu_tflite_16k-linux-amd64-prod-opt.yml +++ /dev/null @@ -1,12 +0,0 @@ -build: - template_file: test-linux-opt-base.tyml - dependencies: - - "linux-amd64-tflite-opt" - system_setup: - > - apt-get -qq -y install ${python.packages_trusty.apt} - args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests-prod.sh 2.7.14:mu 16k" - metadata: - name: "DeepSpeech Linux AMD64 TFLite Python v2.7 mu prod tests (16kHz)" - description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7 mu on prod model, TFLite, optimized version (16kHz)" diff --git a/taskcluster/test-python_27mu_tflite_8k-linux-amd64-prod-opt.yml b/taskcluster/test-python_27mu_tflite_8k-linux-amd64-prod-opt.yml deleted file mode 100644 index c22dbfb7..00000000 --- a/taskcluster/test-python_27mu_tflite_8k-linux-amd64-prod-opt.yml +++ /dev/null @@ -1,12 +0,0 @@ -build: - template_file: test-linux-opt-base.tyml - dependencies: - - "linux-amd64-tflite-opt" - system_setup: - > - apt-get -qq -y install ${python.packages_trusty.apt} - args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests-prod.sh 2.7.14:mu 8k" - metadata: - name: "DeepSpeech Linux AMD64 TFLite Python v2.7 mu prod tests (8kHz)" - description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7 mu on prod model, TFLite, optimized version (8kHz)"