Skip to content

Commit bba2bfe

Browse files
committed
[dist] Reorganize dist/ into scripts/ and packaging/
1 parent 629439d commit bba2bfe

43 files changed

Lines changed: 56 additions & 205 deletions

Some content is hidden

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

.github/workflows/build-windows.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,17 @@ on:
77
- cron: '0 0 * * *'
88
pull_request:
99
paths:
10-
- dist/**
10+
- packaging/**
11+
- scripts/**
1112
- scenedetect/**
1213
- tests/**
1314
- pyproject.toml
1415
- requirements_headless.txt
1516
- .github/workflows/build-windows.yml
1617
push:
1718
paths:
18-
- dist/**
19+
- packaging/**
20+
- scripts/**
1921
- scenedetect/**
2022
- tests/**
2123
- pyproject.toml
@@ -52,7 +54,7 @@ jobs:
5254
run: |
5355
python -m pip install --upgrade pip build wheel virtualenv setuptools
5456
pip install -r docs/requirements.txt
55-
pip install --upgrade -r dist/requirements_windows.txt --no-binary imageio-ffmpeg
57+
pip install --upgrade -r packaging/windows/requirements.txt --no-binary imageio-ffmpeg
5658
5759
- name: Download Resources
5860
run: |
@@ -75,8 +77,8 @@ jobs:
7577
7678
- name: Build PySceneDetect
7779
run: |
78-
python dist/pre_release.py
79-
pyinstaller dist/scenedetect.spec
80+
python scripts/pre_release.py
81+
pyinstaller packaging/windows/scenedetect.spec
8082
8183
- name: Build Documentation
8284
run: |
@@ -87,9 +89,8 @@ jobs:
8789
run: |
8890
Move-Item -Path LICENSE -Destination dist/scenedetect/
8991
New-Item -Path dist/scenedetect/ -Name thirdparty -ItemType Directory
90-
Move-Item -Path dist/windows/README* -Destination dist/scenedetect/
91-
Move-Item -Path dist/windows/LICENSE* -Destination dist/scenedetect/thirdparty/
92-
Move-Item -Path scenedetect/_thirdparty/LICENSE* -Destination dist/scenedetect/thirdparty/
92+
Copy-Item -Path packaging/windows/LICENSE-PYTHON -Destination dist/scenedetect/thirdparty/
93+
Copy-Item -Path scenedetect/_thirdparty/LICENSE* -Destination dist/scenedetect/thirdparty/
9394
7z e -odist/ffmpeg ffmpeg-${{ env.ffmpeg-version }}-full_build.7z LICENSE -r
9495
Move-Item -Path ffmpeg.exe -Destination dist/scenedetect/ffmpeg.exe
9596
Move-Item -Path dist/ffmpeg/LICENSE -Destination dist/scenedetect/thirdparty/LICENSE-FFMPEG

.github/workflows/build.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ on:
66
- cron: '0 0 * * *'
77
pull_request:
88
paths:
9-
- dist/**
9+
- packaging/**
10+
- scripts/**
1011
- scenedetect/**
1112
- tests/**
1213
- pyproject.toml
@@ -15,7 +16,8 @@ on:
1516
- .github/actions/setup-ffmpeg/**
1617
push:
1718
paths:
18-
- dist/**
19+
- packaging/**
20+
- scripts/**
1921
- scenedetect/**
2022
- tests/**
2123
- pyproject.toml

.github/workflows/check-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
run: |
3939
python -m pip install --upgrade pip build wheel virtualenv
4040
pip install -r docs/requirements.txt
41-
pip install -r dist/requirements_windows.txt
41+
pip install -r packaging/windows/requirements.txt
4242
4343
4444
- name: Check CLI Documentation

.github/workflows/generate-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
run: |
4848
python -m pip install --upgrade pip build wheel virtualenv
4949
pip install -r docs/requirements.txt
50-
pip install -r dist/requirements_windows.txt
50+
pip install -r packaging/windows/requirements.txt
5151
git config --global user.name github-actions
5252
git config --global user.email github-actions@github.com
5353

.github/workflows/release-test.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,8 @@ jobs:
3939
fi
4040
- name: Build and Check
4141
run: |
42-
# Build to a clean output dir - `dist/` already holds tracked installer
43-
# scripts and config (e.g. dist/generate_assets.py, dist/installer/),
44-
# so `twine check dist/*` would try to validate non-distribution files.
45-
python -m build --outdir build-dist
46-
twine check build-dist/*
42+
python -m build
43+
twine check dist/*
4744
- name: pip-audit
4845
# CVE-2026-3219 in pip 26.0.1 has no fix version available upstream
4946
# and pip ships pre-installed on the runner (not controlled by this

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ tests/resources/*
99
*.mkv
1010
*.m4v
1111
*.csv
12+
packaging/windows/.version_info
1213
benchmarks/BCC/*.mp4
1314
*.txt
1415
benchmarks/RAI/*.mp4

MANIFEST.in

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
recursive-exclude .github *
2-
recursive-exclude dist *
2+
recursive-exclude packaging *
3+
recursive-exclude scripts *
34
recursive-exclude docs *
45
recursive-exclude website *
56
exclude *
@@ -8,5 +9,5 @@ include LICENSE
89
include pyproject.toml
910
include setup.cfg
1011
include scenedetect.cfg
11-
include dist/package-info.rst
12+
include packaging/package-info.rst
1213
recursive-include docs *

RELEASE-PLAN.md

Lines changed: 5 additions & 5 deletions

appveyor.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ install:
3939
- python --version
4040
- python -m pip install --upgrade pip build wheel virtualenv setuptools
4141
- python -m pip install -r docs/requirements.txt
42-
- python -m pip install --upgrade -r dist/requirements_windows.txt --no-binary imageio-ffmpeg
42+
- python -m pip install --upgrade -r packaging/windows/requirements.txt --no-binary imageio-ffmpeg
4343
# Checkout build resources and third party software used for testing.
44-
- git checkout refs/remotes/origin/resources -- dist/
44+
- git checkout refs/remotes/origin/resources -- packaging/
4545
- appveyor DownloadFile https://github.com/GyanD/codexffmpeg/releases/download/%ffmpeg_version%/ffmpeg-%ffmpeg_version%-full_build.7z
4646
- 7z e ffmpeg-%ffmpeg_version%-full_build.7z -odist/ffmpeg ffmpeg.exe LICENSE -r
4747
- 'SET IMAGEIO_FFMPEG_EXE=%APPVEYOR_BUILD_FOLDER%\\dist\\ffmpeg\\ffmpeg.exe'
@@ -50,14 +50,13 @@ install:
5050
- echo * * BUILDING WINDOWS EXE * *
5151
- echo * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
5252
# Build Windows .EXE and create portable .ZIP
53-
- python dist/pre_release.py --release
54-
- pyinstaller dist/scenedetect.spec
53+
- python scripts/pre_release.py --release
54+
- pyinstaller packaging/windows/scenedetect.spec
5555
- sphinx-build -b singlehtml docs dist/scenedetect/docs
5656
- mkdir dist\scenedetect\thirdparty
5757
- move LICENSE dist\scenedetect\
58-
- move dist\windows\README* dist\scenedetect\
59-
- move dist\windows\LICENSE* dist\scenedetect\thirdparty\
60-
- move scenedetect\_thirdparty\LICENSE* dist\scenedetect\thirdparty\
58+
- copy packaging\windows\LICENSE-PYTHON dist\scenedetect\thirdparty\
59+
- copy scenedetect\_thirdparty\LICENSE* dist\scenedetect\thirdparty\
6160
- copy dist\ffmpeg\ffmpeg.exe dist\scenedetect\
6261
- move dist\ffmpeg\LICENSE dist\scenedetect\thirdparty\LICENSE-FFMPEG
6362
- cd dist/scenedetect
@@ -68,7 +67,7 @@ install:
6867
- echo * * BUILDING MSI INSTALLER * *
6968
- echo * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
7069
# Download, install, and register AdvancedInstaller
71-
- cd dist/installer
70+
- cd packaging/windows/installer
7271
- ps: iex ((New-Object Net.WebClient).DownloadString('https://raw.githubusercontent.com/appveyor/secure-file/master/install.ps1'))
7372
- appveyor-tools\secure-file -decrypt license65.dat.enc -secret %ai_license_secret% -salt %ai_license_salt%
7473
- appveyor DownloadFile https://www.advancedinstaller.com/downloads/advinst.msi
@@ -84,8 +83,8 @@ install:
8483
- echo * * PACKAGING BUILD ARTIFACTS * *
8584
- echo * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
8685
# Zip all resources together for code signing
86+
- move packaging\windows\installer\PySceneDetect-*.msi dist\
8787
- cd dist
88-
- move installer\PySceneDetect-*.msi .
8988
- cp scenedetect\scenedetect.exe .
9089
- 7z a scenedetect-signed.zip scenedetect.exe PySceneDetect-*.msi
9190
- cd ..

0 commit comments

Comments
 (0)