Apply black

README.md

@@ -13,6 +13,7 @@
 |[docs/coverage] python3.8|||||[![Build Status](https://travis-ci.org/espnet/espnet.svg?branch=master)](https://travis-ci.org/espnet/espnet)|
 
 [![codecov](https://codecov.io/gh/espnet/espnet/branch/master/graph/badge.svg)](https://codecov.io/gh/espnet/espnet)
+[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
 [![Mergify Status](https://img.shields.io/endpoint.svg?url=https://gh.mergify.io/badges/espnet/espnet&style=flat)](https://mergify.io)
 [![Gitter](https://badges.gitter.im/espnet-en/community.svg)](https://gitter.im/espnet-en/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 

ci/test_flake8.sh

@@ -72,10 +72,7 @@ cov=$(echo "scale = 4; 100 * ${n_ok} / ${n_all}" | bc)
 echo "flake8-docstrings ready files coverage: ${n_ok} / ${n_all} = ${cov}%"
 
 # --extend-ignore for wip files for flake8-docstrings
-flake8 --show-source --extend-ignore=D test utils doc ${flake8_black_list} --exclude test/espnet2
+flake8 --show-source --extend-ignore=D test utils doc ${flake8_black_list} espnet2 test/espnet2
 
 # white list of files that should support flake8-docstrings
 flake8 --show-source espnet --exclude=${flake8_black_list//$'\n'/,}
-
-# espnet2
-flake8 --show-source --extend-ignore=D --ignore=H102,H238,E203,W503 --max-line-length 88 espnet2 test/espnet2

ci/test_python.sh

@@ -6,15 +6,17 @@ fi
 
 set -euo pipefail
 
-"$(dirname $0)"/test_flake8.sh
+modules="espnet espnet2 test utils setup.py egs*/*/*/local egs2/TEMPLATE/asr1/pyscripts"
 
-pycodestyle -r espnet test utils --show-source --show-pep8 
-if ! black --check espnet2 test/espnet2 setup.py; then
-    echo "Please apply: 'black espnet2/ test/espnet2 setup.py'"
+# black
+if ! black --check ${modules}; then
+    echo "Please apply:\n    % black ${modules}"
     exit 1
 fi
 
-# espnet2 follows "black" style.
-pycodestyle -r espnet2 test/espnet2 setup.py --max-line-length 88 --ignore E203,W503 --show-source --show-pep8 
+# flake8
+"$(dirname $0)"/test_flake8.sh
+# pycodestyle
+pycodestyle -r ${modules} --show-source --show-pep8 
 
 LD_LIBRARY_PATH="${LD_LIBRARY_PATH:-}:$(pwd)/tools/chainer_ctc/ext/warp-ctc/build" pytest -q

egs/an4/asr1/local/data_prep.py

@@ -21,41 +21,47 @@
 import sys
 
 if len(sys.argv) != 3:
-    print ('Usage: python data_prep.py [an4_root] [sph2pipe]')
+    print("Usage: python data_prep.py [an4_root] [sph2pipe]")
     sys.exit(1)
 an4_root = sys.argv[1]
 sph2pipe = sys.argv[2]
 
-sph_dir = {
-    'train': 'an4_clstk',
-    'test': 'an4test_clstk'
-}
+sph_dir = {"train": "an4_clstk", "test": "an4test_clstk"}
 
-for x in ['train', 'test']:
-    with open(os.path.join(an4_root, 'etc', 'an4_' + x + '.transcription')) as transcript_f, \
-         open(os.path.join('data', x, 'text'), 'w') as text_f, \
-         open(os.path.join('data', x, 'wav.scp'), 'w') as wav_scp_f, \
-         open(os.path.join('data', x, 'utt2spk'), 'w') as utt2spk_f:
+for x in ["train", "test"]:
+    with open(
+        os.path.join(an4_root, "etc", "an4_" + x + ".transcription")
+    ) as transcript_f, open(os.path.join("data", x, "text"), "w") as text_f, open(
+        os.path.join("data", x, "wav.scp"), "w"
+    ) as wav_scp_f, open(
+        os.path.join("data", x, "utt2spk"), "w"
+    ) as utt2spk_f:
 
         text_f.truncate()
         wav_scp_f.truncate()
         utt2spk_f.truncate()
 
-        lines = sorted(transcript_f.readlines(), key=lambda s: s.split(' ')[0])
+        lines = sorted(transcript_f.readlines(), key=lambda s: s.split(" ")[0])
         for line in lines:
             line = line.strip()
             if not line:
                 continue
-            words = re.search(r'^(.*) \(', line).group(1)
-            if words[:4] == '<s> ':
+            words = re.search(r"^(.*) \(", line).group(1)
+            if words[:4] == "<s> ":
                 words = words[4:]
-            if words[-5:] == ' </s>':
+            if words[-5:] == " </s>":
                 words = words[:-5]
-            source = re.search(r'\((.*)\)', line).group(1)
-            pre, mid, last = source.split('-')
-            utt_id = '-'.join([mid, pre, last])
-
-            text_f.write(utt_id + ' ' + words + '\n')
-            wav_scp_f.write(utt_id + ' ' + sph2pipe + ' -f wav -p -c 1 ' + \
-                os.path.join(an4_root, 'wav', sph_dir[x], mid, source + '.sph') + ' |\n')
-            utt2spk_f.write(utt_id + ' ' + mid + '\n')
+            source = re.search(r"\((.*)\)", line).group(1)
+            pre, mid, last = source.split("-")
+            utt_id = "-".join([mid, pre, last])
+
+            text_f.write(utt_id + " " + words + "\n")
+            wav_scp_f.write(
+                utt_id
+                + " "
+                + sph2pipe
+                + " -f wav -p -c 1 "
+                + os.path.join(an4_root, "wav", sph_dir[x], mid, source + ".sph")
+                + " |\n"
+            )
+            utt2spk_f.write(utt_id + " " + mid + "\n")

egs/arctic/tts1/local/clean_text.py

@@ -11,9 +11,9 @@
 
 if __name__ == "__main__":
     parser = argparse.ArgumentParser()
-    parser.add_argument('text', type=str, help='text to be cleaned')
+    parser.add_argument("text", type=str, help="text to be cleaned")
     args = parser.parse_args()
-    with codecs.open(args.text, 'r', 'utf-8') as fid:
+    with codecs.open(args.text, "r", "utf-8") as fid:
         for line in fid.readlines():
             line = line.split(" ")
             id = line[0]

egs/blizzard17/tts1/local/make_lab_w_punc.py

@@ -6,6 +6,7 @@
 import os
 import sys
 
+
 def write_lab(out_dir, rfile, data):
     os.makedirs(out_dir, exist_ok=True)
     wfile = os.path.join(out_dir, os.path.basename(rfile))
@@ -15,6 +16,7 @@ def write_lab(out_dir, rfile, data):
             wf.write(data[data_row][1] + "\t")
             wf.write(data[data_row][2] + "\n")
 
+
 def main():
     args = sys.argv
     list_file = args[1]
@@ -32,17 +34,20 @@ def main():
     for n in range(len(new_lab)):
         row_num = int(flist[n][1]) - 1
 
-        if (rfile != flist[n][0]):
-            if (rfile != ""):
+        if rfile != flist[n][0]:
+            if rfile != "":
                 write_lab(out_dir, rfile, data)
-        
+
             rfile = flist[n][0]
             delimiter = "\t"
             with open(rfile, "r") as rf:
-                data = list(map(lambda x: x.split(delimiter), rf.read().strip().split("\n")))
+                data = list(
+                    map(lambda x: x.split(delimiter), rf.read().strip().split("\n"))
+                )
 
         data[row_num][2] = new_lab[n]
     write_lab(out_dir, rfile, data)
 
+
 if __name__ == "__main__":
     main()