Skip to content

Commit 2d97e2d

Browse files
committed
[dist] Finish PEP 621 migration
1 parent bba2bfe commit 2d97e2d

19 files changed

Lines changed: 81 additions & 144 deletions

.github/workflows/build-windows.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ on:
1212
- scenedetect/**
1313
- tests/**
1414
- pyproject.toml
15-
- requirements_headless.txt
1615
- .github/workflows/build-windows.yml
1716
push:
1817
paths:
@@ -21,7 +20,6 @@ on:
2120
- scenedetect/**
2221
- tests/**
2322
- pyproject.toml
24-
- requirements_headless.txt
2523
- .github/workflows/build-windows.yml
2624
branches:
2725
- main
@@ -53,7 +51,7 @@ jobs:
5351
- name: Install Dependencies
5452
run: |
5553
python -m pip install --upgrade pip build wheel virtualenv setuptools
56-
pip install -r docs/requirements.txt
54+
pip install .[docs]
5755
pip install --upgrade -r packaging/windows/requirements.txt --no-binary imageio-ffmpeg
5856
5957
- name: Download Resources

.github/workflows/build.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ on:
1111
- scenedetect/**
1212
- tests/**
1313
- pyproject.toml
14-
- requirements_headless.txt
1514
- .github/workflows/build.yml
1615
- .github/actions/setup-ffmpeg/**
1716
push:
@@ -21,7 +20,6 @@ on:
2120
- scenedetect/**
2221
- tests/**
2322
- pyproject.toml
24-
- requirements_headless.txt
2523
- .github/workflows/build.yml
2624
- .github/actions/setup-ffmpeg/**
2725
branches:
@@ -59,7 +57,7 @@ jobs:
5957
- name: Install Dependencies
6058
run: |
6159
python -m pip install --upgrade pip build wheel virtualenv setuptools
62-
pip install -r requirements_headless.txt --only-binary av,opencv-python-headless
60+
pip install -e .[dev] --only-binary av,opencv-python
6361
6462
- name: Install MoviePy
6563
# TODO: We can only run MoviePy tests on systems that have ffmpeg.

.github/workflows/check-code-format.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- name: Install Dependencies
3333
run: |
3434
python -m pip install --upgrade pip
35-
python -m pip install -r requirements_headless.txt --only-binary av,opencv-python-headless
35+
python -m pip install -e .[dev] --only-binary av,opencv-python
3636
3737
- name: Check Code Format (yapf)
3838
if: ${{ hashFiles('.style.yapf') != '' }}

.github/workflows/check-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
- name: Install Dependencies
3838
run: |
3939
python -m pip install --upgrade pip build wheel virtualenv
40-
pip install -r docs/requirements.txt
40+
pip install .[docs]
4141
pip install -r packaging/windows/requirements.txt
4242
4343

.github/workflows/generate-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
- name: Setup Environment
4747
run: |
4848
python -m pip install --upgrade pip build wheel virtualenv
49-
pip install -r docs/requirements.txt
49+
pip install .[docs]
5050
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

.github/workflows/generate-website.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Install Dependencies
2626
run: |
2727
python -m pip install --upgrade pip build wheel virtualenv
28-
pip install -r website/requirements.txt
28+
pip install .[website]
2929
3030
- name: Generate Website
3131
run: |

.github/workflows/release-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
- name: Install dependencies
7171
run: |
7272
python -m pip install --upgrade pip
73-
pip install .[opencv,pyav,moviepy]
73+
pip install .[pyav,moviepy]
7474
pip install opentimelineio pillow psutil pytest
7575
- name: Run release tests
7676
run: pytest -m release -vv --ignore=tests/release/test_long_video_stress.py
@@ -94,7 +94,7 @@ jobs:
9494
- name: Install dependencies
9595
run: |
9696
python -m pip install --upgrade pip
97-
pip install .[opencv,pyav]
97+
pip install .[pyav]
9898
pip install psutil pytest
9999
- name: Run long stress test
100100
run: pytest -m release -k long_video -vv

MANIFEST.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ exclude *
77
include README.md
88
include LICENSE
99
include pyproject.toml
10-
include setup.cfg
1110
include scenedetect.cfg
1211
include packaging/package-info.rst
1312
recursive-include docs *

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ install:
3838
- 'SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%'
3939
- python --version
4040
- python -m pip install --upgrade pip build wheel virtualenv setuptools
41-
- python -m pip install -r docs/requirements.txt
41+
- python -m pip install .[docs]
4242
- 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.
4444
- git checkout refs/remotes/origin/resources -- packaging/

docs/.readthedocs.yaml

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)