Merge remote-tracking branch 'origin/develop'

.github/workflows/ci.yml

@@ -38,3 +38,9 @@ jobs:
         python -m pip install dist/*.gz
         python -m pypinyin test
         python -m pypinyin.tools.toneconvert to-tone 'zhong4 xin1'
+
+    - name: test import time
+      if: startsWith(matrix.os,'ubuntu')
+      run: |
+        set -xe
+        time python -c 'from pypinyin import pinyin'

.pre-commit-config.yaml

@@ -4,18 +4,18 @@ repos:
     hooks:
       - id: check-merge-conflict
       - id: debug-statements
-        exclude: 'tools/|(pypinyin/(phrases_dict.py|pinyin_dict.py|phonetic_symbol.py))'
+        exclude: 'tools/|(pypinyin/(legacy/|phonetic_symbol.py))'
       - id: double-quote-string-fixer
-        exclude: 'pypinyin/(phrases_dict.py|pinyin_dict.py|phonetic_symbol.py)'
+        exclude: 'pypinyin/(legacy/|phonetic_symbol.py)'
       - id: end-of-file-fixer
-        exclude: '.bumpversion.cfg'
+        exclude: '.bumpversion.cfg|.*.json'
       - id: requirements-txt-fixer
       - id: trailing-whitespace
   - repo: https://github.com/pycqa/flake8
     rev: 3.8.4
     hooks:
       - id: flake8
-        exclude: 'tools|pypinyin/(phrases_dict.py|pinyin_dict.py|phonetic_symbol.py)|(docs/conf.py)'
+        exclude: 'tools|pypinyin/(legacy/|phonetic_symbol.py)|(docs/conf.py)'
   # - repo: https://github.com/pre-commit/mirrors-mypy
   #   rev: 'v0.812'
   #   hooks:

MANIFEST.in

@@ -1,2 +1,2 @@
 include README.rst LICENSE.txt CHANGELOG.rst
-recursive-include pypinyin *.pyi py.typed
+recursive-include pypinyin *.pyi py.typed *.json

Makefile

@@ -53,12 +53,18 @@ gen_data: sync_submodule gen_pinyin_dict gen_phrases_dict
 
 .PHONY: gen_pinyin_dict
 gen_pinyin_dict: sync_submodule
-	python gen_pinyin_dict.py pinyin-data/pinyin.txt pypinyin/pinyin_dict.py
+	python gen_pinyin_dict.py pinyin-data/pinyin.txt pypinyin/legacy/pinyin_dict.py
+	$(MAKE) to_json source=pypinyin/legacy/pinyin_dict.py var=pinyin_dict dst=pypinyin/pinyin_dict.json
 
 .PHONY: gen_phrases_dict
 gen_phrases_dict: sync_submodule
-	python gen_phrases_dict.py phrase-pinyin-data/pinyin.txt pypinyin/phrases_dict_large.py
-	python tidy_phrases_dict.py
+	python gen_phrases_dict.py phrase-pinyin-data/pinyin.txt pypinyin/legacy/phrases_dict.py
+	$(MAKE) to_json source=pypinyin/legacy/phrases_dict.py var=phrases_dict dst=pypinyin/phrases_dict.json
+
+
+.PHONY: to_json
+to_json:
+	python -c 'import json; exec(open("$(source)").read()); json.dump($(var), open("$(dst)", "w"), ensure_ascii=False, sort_keys=True, indent="")'
 
 .PHONY: sync_submodule
 sync_submodule: