Remove Python 2.7

Fixes #2659
2020-01-13 10:31:41 +01:00 · 2020-01-13 10:31:41 +01:00 · 197704b868
commit 197704b868
parent 2df62da147
14 changed files with 2 additions and 168 deletions
--- 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
--- a/taskcluster/test-python_27m-darwin-amd64-opt.yml
+++ b/taskcluster/test-python_27m-darwin-amd64-opt.yml
@ -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"
--- a/taskcluster/test-python_27m_16k-linux-amd64-opt.yml
+++ b/taskcluster/test-python_27m_16k-linux-amd64-opt.yml
@ -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)"
--- a/taskcluster/test-python_27m_16k-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-python_27m_16k-linux-amd64-prod_pbmodel-opt.yml
@ -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)"
--- a/taskcluster/test-python_27m_8k-linux-amd64-opt.yml
+++ b/taskcluster/test-python_27m_8k-linux-amd64-opt.yml
@ -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)"
--- a/taskcluster/test-python_27m_8k-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-python_27m_8k-linux-amd64-prod_pbmodel-opt.yml
@ -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)"
--- a/taskcluster/test-python_27m_tflite_16k-linux-amd64-prod-opt.yml
+++ b/taskcluster/test-python_27m_tflite_16k-linux-amd64-prod-opt.yml
@ -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)"
--- a/taskcluster/test-python_27m_tflite_8k-linux-amd64-prod-opt.yml
+++ b/taskcluster/test-python_27m_tflite_8k-linux-amd64-prod-opt.yml
@ -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)"
--- a/taskcluster/test-python_27mu_16k-linux-amd64-opt.yml
+++ b/taskcluster/test-python_27mu_16k-linux-amd64-opt.yml
@ -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)"
--- a/taskcluster/test-python_27mu_16k-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-python_27mu_16k-linux-amd64-prod_pbmodel-opt.yml
@ -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)"
--- a/taskcluster/test-python_27mu_8k-linux-amd64-opt.yml
+++ b/taskcluster/test-python_27mu_8k-linux-amd64-opt.yml
@ -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)"
--- a/taskcluster/test-python_27mu_8k-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-python_27mu_8k-linux-amd64-prod_pbmodel-opt.yml
@ -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)"
--- a/taskcluster/test-python_27mu_tflite_16k-linux-amd64-prod-opt.yml
+++ b/taskcluster/test-python_27mu_tflite_16k-linux-amd64-prod-opt.yml
@ -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)"
--- a/taskcluster/test-python_27mu_tflite_8k-linux-amd64-prod-opt.yml
+++ b/taskcluster/test-python_27mu_tflite_8k-linux-amd64-prod-opt.yml
@ -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)"