From ed70f2e619f67e7cd7351958ff162f1ba5b7964e Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Mon, 11 Jul 2022 22:39:36 +0200 Subject: [PATCH 1/4] Upgrade GitHub Actions (#643) --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cf65206d..bb9842ba 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,9 +17,9 @@ jobs: - "3.9" - "3.10" steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v3 with: python-version: ${{ matrix.python-version }} - name: Install ffmpeg From ef00863269588f79031a56a17509198ded8b8da2 Mon Sep 17 00:00:00 2001 From: Karl Kroening Date: Mon, 11 Jul 2022 13:51:06 -0700 Subject: [PATCH 2/4] Fix Black in GHA for Python 2.7 (#680) (At least until Python 2.7 support is finally eliminated) --- .github/workflows/ci.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bb9842ba..0bd614b7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,7 +38,8 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 - - uses: psf/black@21.12b0 # TODO: upgrade after dropping Python 2 support. - with: - src: ffmpeg # TODO: also format `examples`. - version: 21.12b0 + - name: Black + run: | + # TODO: use standard `psf/black` action after dropping Python 2 support. + pip install black==21.12b0 click==8.0.2 # https://stackoverflow.com/questions/71673404 + black ffmpeg --check --color --diff From 35886c970c7b3a757115f5a7b6fd1753e64832ce Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Mon, 11 Jul 2022 23:02:31 +0200 Subject: [PATCH 3/4] Upgrade GitHub Actions again (#679) --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0bd614b7..90ae317c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,9 +17,9 @@ jobs: - "3.9" - "3.10" steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v3 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - name: Install ffmpeg @@ -37,7 +37,7 @@ jobs: black: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Black run: | # TODO: use standard `psf/black` action after dropping Python 2 support. From df129c7ba30aaa9ffffb81a48f53aa7253b0b4e6 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Mon, 11 Jul 2022 23:03:07 +0200 Subject: [PATCH 4/4] Let's implicitly fix a typo (#681) --- ffmpeg/dag.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ffmpeg/dag.py b/ffmpeg/dag.py index 3508dd49..4bdac44d 100644 --- a/ffmpeg/dag.py +++ b/ffmpeg/dag.py @@ -74,7 +74,7 @@ def incoming_edge_map(self): """Provides information about all incoming edges that connect to this node. The edge map is a dictionary that maps an ``incoming_label`` to - ``(outgoing_node, outgoing_label)``. Note that implicity, ``incoming_node`` is + ``(outgoing_node, outgoing_label)``. Note that implicitly, ``incoming_node`` is ``self``. See "Edges" section above. """ raise NotImplementedError()