diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2723c79963be..5f0fdac10bc9 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -17,7 +17,7 @@ jobs: steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 - - run: pip install toml + - run: pip install $(grep tomli== requirements-tests-py3.txt) - run: ./tests/check_consistent.py pep-604: @@ -77,7 +77,7 @@ jobs: steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 - - run: pip install $(grep mypy== requirements-tests-py3.txt) + - run: pip install $(grep tomli== requirements-tests-py3.txt) $(grep mypy== requirements-tests-py3.txt) - run: ./tests/mypy_test.py --platform=${{ matrix.platform }} --python-version=${{ matrix.python-version }} pyright: @@ -125,7 +125,7 @@ jobs: - name: Update pip run: python -m pip install -U pip - name: Install dependencies - run: pip install $(grep mypy== requirements-tests-py3.txt) + run: pip install $(grep tomli== requirements-tests-py3.txt) $(grep mypy== requirements-tests-py3.txt) - name: Run stubtest run: python tests/stubtest_stdlib.py --ignore-unused-allowlist @@ -142,6 +142,6 @@ jobs: with: python-version: 3.9 - name: Install dependencies - run: pip install toml + run: pip install $(grep tomli== requirements-tests-py3.txt) - name: Run stubtest run: python tests/stubtest_third_party.py --num-shards 4 --shard-index ${{ matrix.shard-index }} diff --git a/requirements-tests-py3.txt b/requirements-tests-py3.txt index 8ca5920a7304..9d73bf198d68 100644 --- a/requirements-tests-py3.txt +++ b/requirements-tests-py3.txt @@ -6,3 +6,4 @@ flake8-bugbear==21.4.3 flake8-pyi==20.10.0 isort==5.9.3 pytype==2021.08.11 +tomli==1.1.0 diff --git a/tests/check_consistent.py b/tests/check_consistent.py index 9186ea6f3309..1d1d719322c1 100755 --- a/tests/check_consistent.py +++ b/tests/check_consistent.py @@ -15,7 +15,7 @@ import os import re -import toml +import tomli consistent_files = [ {"stdlib/@python2/builtins.pyi", "stdlib/@python2/__builtin__.pyi"}, @@ -165,7 +165,7 @@ def _strip_dep_version(dependency): def check_metadata(): for distribution in os.listdir("stubs"): with open(os.path.join("stubs", distribution, "METADATA.toml")) as f: - data = toml.loads(f.read()) + data = tomli.loads(f.read()) assert "version" in data, f"Missing version for {distribution}" version = data["version"] msg = f"Unsupported Python version {version}" diff --git a/tests/mypy_test.py b/tests/mypy_test.py index 441c406ecc4d..0b812b6d369a 100755 --- a/tests/mypy_test.py +++ b/tests/mypy_test.py @@ -21,7 +21,7 @@ from pathlib import Path from typing import Dict, NamedTuple -import toml +import tomli parser = argparse.ArgumentParser(description="Test runner for typeshed. Patterns are unanchored regexps on the full path.") parser.add_argument("-v", "--verbose", action="count", default=0, help="More output") @@ -101,7 +101,7 @@ def parse_version(v_str): def is_supported(distribution, major): dist_path = Path("stubs", distribution) with open(dist_path / "METADATA.toml") as f: - data = dict(toml.loads(f.read())) + data = dict(tomli.loads(f.read())) if major == 2: # Python 2 is not supported by default. return bool(data.get("python2", False)) or (dist_path / "@python2").exists() @@ -154,7 +154,7 @@ def add_configuration(configurations, seen_dist_configs, distribution): return with open(os.path.join("stubs", distribution, "METADATA.toml")) as f: - data = dict(toml.loads(f.read())) + data = dict(tomli.loads(f.read())) mypy_tests_conf = data.get("mypy-tests") if not mypy_tests_conf: diff --git a/tests/stubtest_third_party.py b/tests/stubtest_third_party.py index 2401cc58f62e..f95f1ffdfc06 100755 --- a/tests/stubtest_third_party.py +++ b/tests/stubtest_third_party.py @@ -6,7 +6,7 @@ import subprocess import sys import tempfile -import toml +import tomli import venv from glob import glob from pathlib import Path @@ -34,7 +34,7 @@ def get_mypy_req(): def run_stubtest(dist: Path) -> None: with open(dist / "METADATA.toml") as f: - metadata = dict(toml.loads(f.read())) + metadata = dict(tomli.loads(f.read())) # Ignore stubs that don't support Python 3 if not has_py3_stubs(dist):