Skip to content

Commit bcdc668

Browse files
committed
[build] Update Windows build dependencies.
Don't build .EXE anymore on main development branch as it uses outdated dependencies. Windows builds are now done in the build-windows branch.
1 parent d4a76e6 commit bcdc668

3 files changed

Lines changed: 10 additions & 28 deletions

File tree

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ matrix:
99
- os: linux
1010
dist: xenial
1111
language: python
12-
python: "3.7"
12+
python: "3.8"
1313

1414
- os: linux
1515
dist: bionic

appveyor.yml

Lines changed: 7 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -29,26 +29,14 @@ install:
2929
- python -m pip install --upgrade setuptools wheel pyinstaller==4.10
3030

3131
# Install PySceneDetect dependencies and checkout resources required for tests.
32-
- python -m pip install -r dist/requirements_windows.txt
32+
- python -m pip install -r requirements_headless.txt
3333
- git fetch --depth=1 https://github.com/Breakthrough/PySceneDetect.git refs/heads/resources:refs/remotes/origin/resources
3434
- git checkout refs/remotes/origin/resources -- tests/resources/
3535
- git checkout refs/remotes/origin/resources -- dist/
3636

3737
# Build Python package
3838
- python setup.py sdist bdist_wheel
3939

40-
# Build Windows .EXE
41-
- pyinstaller dist/scenedetect.spec
42-
43-
# Bundle Windows .EXE distribution with all dependencies.
44-
- python dist/cleanup_dependencies.py
45-
- cd dist/scenedetect
46-
- 7z a ../scenedetect-win64.zip *
47-
- cd ../..
48-
49-
# TODO: Rename using APPVEYOR_REPO_COMMIT env var and inline Powershell script if this is not
50-
# a tagged commit.
51-
5240

5341
test_script:
5442
# Checkout Windows dependencies and extract them.
@@ -59,24 +47,17 @@ test_script:
5947
# Run Unit Tests
6048
- pytest
6149

62-
# Test Windows Build
63-
- cd dist/scenedetect
64-
- scenedetect.exe version
65-
- scenedetect.exe -i ../../tests/resources/testvideo.mp4 -b opencv detect-content time -e 2s
66-
- scenedetect.exe -i ../../tests/resources/testvideo.mp4 -b pyav detect-content time -e 2s
67-
68-
# TODO: Test Python Distributions
50+
# TODO: Test Python Distributions install and function correctly.
6951
# Wildcard expansion doesn't seem to work with pip here, e.g. the following fails:
7052
#- python -m pip install dist\*.whl
53+
# For now we just test the source module directly.
7154

55+
- python -m scenedetect version
56+
- python -m scenedetect -i tests/resources/testvideo.mp4 -b opencv detect-content time -e 2s
57+
- python -m scenedetect -i tests/resources/testvideo.mp4 -b pyav detect-content time -e 2s
7258

73-
artifacts:
74-
- path: dist/scenedetect-win64.zip
75-
name: PySceneDetect-win64_portable
76-
77-
- path: dist/scenedetect/scenedetect.exe
78-
name: PySceneDetect-win64_exeonly
7959

60+
artifacts:
8061
- path: dist/*.tar.gz
8162
name: PySceneDetect-sdist
8263

dist/requirements_windows.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
# PySceneDetect Requirements for Windows Build (Python 3.7+)
33
#
44
# These are pinned to the versions required for the Windows build to work
5-
# using pyinstaller.
5+
# using pyinstaller. If you are installing PySceneDetect directly as a Python
6+
# distribution (e.g. via pip or setup.py), use requirements.txt instead.
67
appdirs
78
av==9.1.0
89
click

0 commit comments

Comments
 (0)