Skip to content

Commit 240ef3b

Browse files
authored
Merge branch 'master' into fix-gpu-h264_nvenc
2 parents e798541 + 35d2ceb commit 240ef3b

File tree

527 files changed

+11835
-8301
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

527 files changed

+11835
-8301
lines changed

Diff for: .github/workflows/build-docs.yml

+53
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
name: Build and Deploy Sphinx Documentation
2+
3+
on:
4+
push:
5+
branches:
6+
- master # Change to your default branch if needed
7+
8+
jobs:
9+
build:
10+
runs-on: ubuntu-latest
11+
12+
steps:
13+
- name: Checkout code
14+
uses: actions/checkout@v3
15+
16+
- name: Set up Python
17+
uses: actions/setup-python@v4
18+
with:
19+
python-version: '3.x' # Specify Python version as needed
20+
21+
- name: Build v1.0.3 documentation
22+
run: |
23+
git fetch --tags
24+
git checkout v1.0.3
25+
pip install "jinja2<3" "MarkupSafe<2" "alabaster==0.7.12"
26+
pip install -e .
27+
pip install -e ".[doc]"
28+
29+
cd docs
30+
make html
31+
mkdir -p ../build/html/v1.0.3
32+
cp -r build/html/* ../build/html/v1.0.3/
33+
rm -rf build/html
34+
git stash
35+
36+
- name: Install dependencies
37+
run: |
38+
git checkout master
39+
python -m pip install --upgrade pip
40+
pip install -e .
41+
pip install -e .[doc]
42+
43+
- name: Build current documentation
44+
run: |
45+
cd docs
46+
make html
47+
cp -r build/html/* ../build/html/
48+
49+
- name: Deploy to GitHub Pages
50+
uses: peaceiris/actions-gh-pages@v4
51+
with:
52+
github_token: ${{ secrets.GITHUB_TOKEN }}
53+
publish_dir: ./build/html/ # Adjusted path since we're copying docs to root build directory

Diff for: .github/workflows/codeql-analysis.yml

+5-11
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
# For most projects, this workflow file will not need changing; you simply need
2-
# to commit it to your repository.
3-
#
4-
# You may wish to alter this file to override the set of languages analyzed,
5-
# or to provide custom queries or build logic.
6-
name: "CodeQL"
1+
name: Code scanning with CodeQL
72

83
on:
94
push:
@@ -18,7 +13,6 @@ jobs:
1813
analyze:
1914
name: Analyze
2015
runs-on: ubuntu-latest
21-
2216
strategy:
2317
fail-fast: false
2418
matrix:
@@ -30,11 +24,11 @@ jobs:
3024

3125
steps:
3226
- name: Checkout repository
33-
uses: actions/checkout@v3
27+
uses: actions/checkout@v4.1.6
3428

3529
# Initializes the CodeQL tools for scanning.
3630
- name: Initialize CodeQL
37-
uses: github/codeql-action/init@v2
31+
uses: github/codeql-action/init@v3
3832
with:
3933
languages: ${{ matrix.language }}
4034
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -45,7 +39,7 @@ jobs:
4539
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
4640
# If this step fails, then you should remove it and run the build manually (see below)
4741
- name: Autobuild
48-
uses: github/codeql-action/autobuild@v2
42+
uses: github/codeql-action/autobuild@v3
4943

5044
# ℹ️ Command-line programs to run using the OS shell.
5145
# 📚 https://git.io/JvXDl
@@ -59,4 +53,4 @@ jobs:
5953
# make release
6054

6155
- name: Perform CodeQL Analysis
62-
uses: github/codeql-action/analyze@v2
56+
uses: github/codeql-action/analyze@v3

Diff for: .github/workflows/format_check.yml

-55
This file was deleted.

Diff for: .github/workflows/formatting_linting.yml

+69
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
# SPDX-FileCopyrightText: 2024 K Kollmann
2+
# SPDX-License-Identifier: MIT
3+
4+
name: Code formatting and linting
5+
6+
on:
7+
pull_request:
8+
push:
9+
branches:
10+
- master
11+
- main
12+
workflow_dispatch:
13+
14+
env:
15+
PYTHON_VERSION: "3.9"
16+
17+
jobs:
18+
black:
19+
name: Black code formatter
20+
runs-on: ubuntu-latest
21+
steps:
22+
- name: Checkout repo
23+
uses: actions/[email protected]
24+
with:
25+
ref: ${{ github.event.pull_request.head.sha }}
26+
- name: Run Black
27+
28+
with:
29+
options: "--version --check --diff --color" # default: "--check --diff"
30+
31+
flake8:
32+
name: Flake8 linter
33+
runs-on: ubuntu-latest
34+
steps:
35+
- name: Checkout repo
36+
uses: actions/[email protected]
37+
with:
38+
ref: ${{ github.event.pull_request.head.sha }}
39+
- name: Set up Python environment – ${{ env.PYTHON_VERSION }}
40+
uses: actions/[email protected]
41+
with:
42+
python-version: ${{ env.PYTHON_VERSION }}
43+
- name: Install dependencies
44+
run: |
45+
python -m pip install --upgrade wheel pip
46+
pip install .[lint]
47+
- name: Show Flake8 version
48+
run: flake8 --version
49+
- name: Run Flake8
50+
run: flake8 -v --show-source --max-line-length=92 moviepy docs/conf.py examples tests
51+
52+
isort:
53+
name: isort import sorter
54+
runs-on: ubuntu-latest
55+
steps:
56+
- name: Checkout repo
57+
uses: actions/[email protected]
58+
with:
59+
ref: ${{ github.event.pull_request.head.sha }}
60+
- name: Set up Python environment – ${{ env.PYTHON_VERSION }}
61+
uses: actions/[email protected]
62+
with:
63+
python-version: ${{ env.PYTHON_VERSION }}
64+
- name: Install dependencies
65+
run: |
66+
python -m pip install --upgrade wheel pip
67+
pip install .[lint]
68+
- name: Run isort
69+
run: isort --check-only --diff moviepy scripts docs/conf.py examples tests

Diff for: .github/workflows/publish.yml

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Publish to PyPI
2+
3+
on:
4+
release:
5+
types: [published]
6+
workflow_dispatch:
7+
inputs:
8+
9+
permissions:
10+
contents: read
11+
12+
jobs:
13+
deploy:
14+
runs-on: ubuntu-latest
15+
environment: release
16+
permissions:
17+
id-token: write
18+
steps:
19+
- uses: actions/checkout@v4
20+
- name: Set up Python
21+
uses: actions/setup-python@v5
22+
with:
23+
python-version: "3.12"
24+
cache: pip
25+
- name: Install dependencies
26+
run: |
27+
pip install setuptools wheel build
28+
- name: Build
29+
run: |
30+
python -m build
31+
- name: Publish
32+
uses: pypa/gh-action-pypi-publish@release/v1

0 commit comments

Comments
 (0)