Skip to content

Commit 306bdae

Browse files
committed
[dist] Remove duplicate copy of ffmpeg in distribution.
1 parent 8358208 commit 306bdae

File tree

4 files changed

+22
-8
lines changed

4 files changed

+22
-8
lines changed

.github/workflows/build-windows.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ jobs:
4545
- name: Install Dependencies
4646
run: |
4747
python -m pip install --upgrade pip build wheel virtualenv setuptools
48-
pip install -r dist/requirements_windows.txt --no-binary imageio-ffmpeg
4948
pip install -r docs/requirements.txt
49+
pip install --upgrade -r dist/requirements_windows.txt --no-binary imageio-ffmpeg
5050
5151
- name: Download Resources
5252
run: |
@@ -69,7 +69,7 @@ jobs:
6969
7070
- name: Build PySceneDetect
7171
run: |
72-
python dist/pre_release.py --ignore-installer
72+
python dist/pre_release.py
7373
pyinstaller dist/scenedetect.spec
7474
7575
- name: Build Documentation

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ install:
4646
- echo * * BUILDING WINDOWS EXE * *
4747
- echo * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
4848
# Build Windows .EXE and create portable .ZIP
49-
- python dist/pre_release.py
49+
- python dist/pre_release.py --release
5050
- pyinstaller dist/scenedetect.spec
5151
- sphinx-build -b singlehtml docs dist/scenedetect/docs
5252
- mkdir dist\scenedetect\thirdparty

dist/pre_release.py

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,20 @@
1-
# -*- coding: utf-8 -*-
1+
#
2+
# PySceneDetect: Python-Based Video Scene Detector
3+
# -------------------------------------------------------------------
4+
# [ Site: https://scenedetect.com ]
5+
# [ Docs: https://scenedetect.com/docs/ ]
6+
# [ Github: https://github.com/Breakthrough/PySceneDetect/ ]
7+
#
8+
# Copyright (C) 2014-2024 Brandon Castellano <http://www.bcastell.com>.
9+
# PySceneDetect is licensed under the BSD 3-Clause License; see the
10+
# included LICENSE file, or visit one of the above pages for details.
11+
#
12+
13+
# Pre-release script to run before invoking `pyinstaller`:
14+
#
15+
# python dist/pre_release.py
16+
# pyinstaller dist/scenedetect.spec
17+
#
218
import os
319
import sys
420
sys.path.append(os.path.abspath("."))
@@ -8,7 +24,7 @@
824

925
VERSION = scenedetect.__version__
1026

11-
run_version_check = ("--ignore-installer" not in sys.argv)
27+
run_version_check = ("--release" in sys.argv)
1228

1329
if run_version_check:
1430
installer_aip = ''

docs/requirements.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
1+
# These are requirements only for the docs.
12
Sphinx == 7.0.1
2-
opencv-python
3-
numpy
4-
av

0 commit comments

Comments
 (0)