From 660f95c36967980f352b460662bf47539fa6d92b Mon Sep 17 00:00:00 2001 From: WyattBlue Date: Sat, 27 Apr 2024 03:43:57 -0400 Subject: [PATCH] Use mypy in lint --- .github/workflows/tests.yml | 2 +- Makefile | 3 ++- setup.py | 6 ++++-- tests/requirements.txt | 1 + 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8912dd02e..4dd70a1ad 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -24,7 +24,7 @@ jobs: - name: Python uses: actions/setup-python@v5 with: - python-version: 3.9 + python-version: 3.12 - name: Packages run: pip install -r tests/requirements.txt diff --git a/Makefile b/Makefile index 9a0b0a95f..968494e2e 100644 --- a/Makefile +++ b/Makefile @@ -25,9 +25,10 @@ fate-suite: rsync -vrltLW rsync://fate-suite.ffmpeg.org/fate-suite/ tests/assets/fate-suite/ lint: - black --check av examples tests + black --check av examples tests setup.py flake8 av examples tests isort --check-only --diff av examples tests + mypy av tests test: $(PYTHON) setup.py test diff --git a/setup.py b/setup.py index 9f43f5f27..8cfcbaa58 100644 --- a/setup.py +++ b/setup.py @@ -72,7 +72,7 @@ def get_config_from_pkg_config(): """ Get distutils-compatible extension arguments using pkg-config. """ - pkg_config = os.environ.get('PKG_CONFIG', 'pkg-config') + pkg_config = os.environ.get("PKG_CONFIG", "pkg-config") try: raw_cflags = subprocess.check_output( [pkg_config, "--cflags", "--libs"] @@ -180,7 +180,9 @@ def parse_cflags(raw_flags): exec(fp.read(), about) package_folders = pathlib.Path("av").glob("**/") -package_data = {".".join(pckg.parts): ["*.pxd", "*.pyi", "*.typed"] for pckg in package_folders} +package_data = { + ".".join(pckg.parts): ["*.pxd", "*.pyi", "*.typed"] for pckg in package_folders +} with open("README.md") as f: diff --git a/tests/requirements.txt b/tests/requirements.txt index fd44ed1b8..f9f354439 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -6,3 +6,4 @@ isort flake8 flake8-pyproject sphinx==5.1.0 +mypy==1.10.0