Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

switch Dockerfile from Python 3.10 to Python 3.12 #55

Merged
merged 1 commit into from
Oct 27, 2024
Merged

switch Dockerfile from Python 3.10 to Python 3.12 #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ jobs:
run: |
docker run -v ${{ github.workspace }}:/home/video_cap \
mv-extractor:local \
python3.10 -m unittest discover -s tests -p "*tests.py"
python3.12 -m unittest discover -s tests -p "*tests.py"

build_and_test_wheels:
name: Build wheels for cp${{ matrix.python }}-${{ matrix.platform_id }}
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ COPY setup.py /home/video_cap
COPY src /home/video_cap/src/

# Install Python package
RUN python3.10 -m pip install .
RUN python3.12 -m pip install .

# Location of the "extract_mvs" script
ENV PATH="$PATH:/opt/_internal/cpython-3.10.15/bin"
ENV PATH="$PATH:/opt/_internal/cpython-3.12.7/bin"

CMD ["sh", "-c", "tail -f /dev/null"]
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ Confirm that all tests pass.

If you are using the Docker image instead of the PyPI package as explained below, you can invoke the tests with
```
sudo ./run.sh python3.10 -m unittest discover -s tests -p "*tests.py"
sudo ./run.sh python3.12 -m unittest discover -s tests -p "*tests.py"
```

### Importing mvextractor into Your Own Scripts
Expand Down Expand Up @@ -114,7 +114,7 @@ git clone https://github.com/LukasBommes/mv-extractor.git mv_extractor

Afterwards, you can run the extraction script in the `mv_extractor` directory as follows
```
sudo ./run.sh python3.10 extract_mvs.py vid_h264.mp4 --preview --verbose
sudo ./run.sh python3.12 extract_mvs.py vid_h264.mp4 --preview --verbose
```
This pulls the prebuild Docker image from DockerHub and runs the extraction script inside the Docker container.

Expand Down