Skip to content

Use ruff for formatting #1847

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
WyattBlue merged 1 commit into from
Mar 29, 2025
Merged

Use ruff for formatting #1847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/smoke.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ jobs:
conda config --add channels conda-forge
conda config --add channels scientific-python-nightly-wheels
conda create -q -n pyav \
cython==3.1.0b0 \
numpy \
pillow \
pytest \
Expand All @@ -135,6 +134,7 @@ jobs:
run: |
. $CONDA/etc/profile.d/conda.sh
conda activate pyav
pip install 'Cython==3.1.0a1'
python scripts\\fetch-vendor.py --config-file scripts\\ffmpeg-${{ matrix.config.ffmpeg }}.json $CONDA_PREFIX\\Library
python scripts\\comptime.py ${{ matrix.config.ffmpeg }}
python setup.py build_ext --inplace --ffmpeg-dir=$CONDA_PREFIX\\Library
Expand Down
5 changes: 2 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,8 @@ fate-suite:
rsync -vrltLW rsync://fate-suite.ffmpeg.org/fate-suite/ tests/assets/fate-suite/

lint:
$(PIP) install -U black isort flake8 flake8-pyproject pillow numpy mypy==1.15.0 pytest
black --check av examples tests setup.py
flake8 av
$(PIP) install -U ruff isort pillow numpy mypy==1.15.0 pytest
ruff format --check av examples tests setup.py
isort --check-only --diff av examples tests
mypy av tests

Expand Down
9 changes: 0 additions & 9 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,3 @@ homepage = "https://pyav.basswood-io.com"
profile = "black"
known_first_party = ["av"]
skip = ["av/__init__.py"]

[tool.flake8]
filename = ["*.py", "*.pyx", "*.pxd"]
ignore = ["E203", "W503"]
max-line-length = 142
per-file-ignores = [
"__init__.py:E402,F401",
"*.pyx,*.pxd:E211,E225,E227,E402,E999",
]
6 changes: 3 additions & 3 deletions tests/test_decode.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,9 +218,9 @@ def test_hardware_decode(self) -> None:
)

HWACCEL_DEVICE_TYPE = os.environ["HWACCEL_DEVICE_TYPE"]
assert (
HWACCEL_DEVICE_TYPE in hwdevices_available
), f"{HWACCEL_DEVICE_TYPE} not available"
assert HWACCEL_DEVICE_TYPE in hwdevices_available, (
f"{HWACCEL_DEVICE_TYPE} not available"
)

test_video_path = "tests/assets/black.mp4"
make_h264_test_video(test_video_path)
Expand Down
Loading