[pull] master from mozillazg:master

.bumpversion.cfg

@@ -1,6 +1,6 @@
 [bumpversion]
 commit = True
 tag = True
-current_version = 0.45.0
+current_version = 0.55.0
 
 [bumpversion:file:pypinyin/__init__.py]

.circleci/config.yml

@@ -6,7 +6,7 @@ version: 2
 jobs:
   python3.8: &DEFAULT
     docker:
-      - image: circleci/python:3.8
+      - image: cimg/python:3.8
 
     environment:
       TOX_ENV: py38
@@ -35,11 +35,14 @@ jobs:
             . venv/bin/activate
 
             pip install coveralls
-            pip install tox
+            pip install 'tox<4.0.0'
 
             if [[ $RUN_CHECK == 1 ]]; then
               pip install -U -r requirements_dev.txt
             fi
+            if [[ $(echo $TOX_ENV | grep pypy3) ]]; then
+              pip install setuptools==60.10.0
+            fi
 
             if [[ $(python -c "import sys; print(sys.stdin.encoding)" |grep None) ]]; then
               export PYTHONIOENCODING=utf-8
@@ -68,58 +71,65 @@ jobs:
             echo hello | pypinyin
             pypinyin < setup.cfg
 
-            coveralls
+            # coveralls
 
       - store_artifacts:
           path: test-reports
           destination: test-reports
 
+  python3.11:
+    <<: *DEFAULT
+    docker:
+      - image: cimg/python:3.11
+    environment:
+      TOX_ENV: py311
+
   python3.10:
     <<: *DEFAULT
     docker:
-      - image: circleci/python:3.10
+      - image: cimg/python:3.10
     environment:
       TOX_ENV: py310
 
   python3.9:
     <<: *DEFAULT
     docker:
-      - image: circleci/python:3.9
+      - image: cimg/python:3.9
     environment:
       TOX_ENV: py39
 
   python3.7:
     <<: *DEFAULT
     docker:
-      - image: circleci/python:3.7
+      - image: cimg/python:3.7
     environment:
       TOX_ENV: py37
 
   python3.6:
     <<: *DEFAULT
     docker:
-      - image: circleci/python:3.6
+      - image: cimg/python:3.6
     environment:
       TOX_ENV: py36
 
   python3.5:
     <<: *DEFAULT
     docker:
-      - image: circleci/python:3.5
+      - image: cimg/python:3.5
     environment:
       TOX_ENV: py35
 
   python3.4:
     <<: *DEFAULT
     docker:
-      - image: circleci/python:3.4
+      - image: python:3.4
     environment:
       TOX_ENV: py34
 
   python2.7:
     <<: *DEFAULT
     docker:
-      - image: circleci/python:2.7
+      - image: cimg/python:2.7
     environment:
       TOX_ENV: py27
 
@@ -149,13 +159,7 @@ workflows:
   version: 2
   testing:
     jobs:
-      - python3.10
-      - python3.9
-      - python3.8
-      - python3.7
       - python3.6
       - python3.5
       - python3.4
       - python2.7
-      - pypy2
-      - pypy3

.devcontainer/devcontainer.json

@@ -0,0 +1,16 @@
+{
+	"name": "python-pinyin",
+	"image": "mcr.microsoft.com/devcontainers/python:1-3.9-bookworm",
+	"features": {},
+	"postCreateCommand": "pip3 install --user -r requirements_dev.txt;pip3 install --user -e .",
+	"customizations": {
+		"vscode": {
+			"extensions": [
+				"hbenl.vscode-test-explorer",
+				"ms-python.mypy-type-checker",
+				"ms-python.python"
+			]
+		}
+	},
+	"forwardPorts": [8080]
+}

.github/dependabot.yml

@@ -3,6 +3,9 @@ updates:
 - package-ecosystem: pip
   directory: "/"
   schedule:
-    interval: daily
-    time: "21:00"
-  open-pull-requests-limit: 10
+    interval: "weekly"
+
+- package-ecosystem: "github-actions"
+  directory: "/"
+  schedule:
+    interval: "weekly"

.github/workflows/ci.yml

@@ -11,19 +11,40 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [windows-latest]
-        # python-version: [2.7, 3.5, 3.6, 3.7, 3.8]
-        python-version: [3.9]
-        tox-env: [py27, py35, py36, py37, py38, py39, py310]
+        os: [windows-2022, ubuntu-22.04]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "pypy3.9", "pypy3.10"]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v5
+
+    - name: Set up uv
+      uses: astral-sh/setup-uv@v7
+
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python-version }}
+
     - name: Install dependencies
       run: |
-        python -m pip install tox
-    - name: Test with tox
-      run: tox -e ${{ matrix.tox-env}}
+        uv pip install --system -r requirements_dev.txt
+        uv pip install --system .
+
+    - name: Run tests
+      run: |
+        python -m pytest tests/ pypinyin/
+
+    - name: test cli
+      if: startsWith(matrix.os,'ubuntu')
+      run: |
+        set -xe
+        uv build
+        uv pip install --system dist/*.tar.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'

.gitignore

@@ -52,3 +52,4 @@ vocab.large.bin
 .mypy_cache/
 .pytest_cache/
 /pypinyin/phrases_dict_large.py
+/docs/CHANGELOG.html

.pre-commit-config.yaml

@@ -1,21 +1,21 @@
 repos:
-  - repo: https://github.com/pre-commit/pre-commit-hooks.git
-    rev: v3.4.0
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v5.0.0
     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://gitlab.com/pycqa/flake8
-    rev: 3.8.4
+  - repo: https://github.com/pycqa/flake8
+    rev: 7.2.0
     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:

.readthedocs.yaml

@@ -0,0 +1,35 @@
+# Read the Docs configuration file for Sphinx projects
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Set the OS, Python version and other tools you might need
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.12"
+    # You can also specify other tool versions:
+    # nodejs: "20"
+    # rust: "1.70"
+    # golang: "1.20"
+
+# Build documentation in the "docs/" directory with Sphinx
+sphinx:
+  configuration: docs/conf.py
+  # You can configure Sphinx to use a different builder, for instance use the dirhtml builder for simpler URLs
+  # builder: "dirhtml"
+  # Fail on all warnings to avoid broken references
+  # fail_on_warning: true
+
+# Optionally build your docs in additional formats such as PDF and ePub
+# formats:
+#   - pdf
+#   - epub
+
+# Optional but recommended, declare the Python requirements required
+# to build your documentation
+# See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
+# python:
+#   install:
+#     - requirements: docs/requirements.txt