Skip to content

Commit 89ac325

Browse files
committed
Merge branch 'master' into latest
2 parents eeab79c + f67b6d6 commit 89ac325

3 files changed

Lines changed: 23 additions & 3 deletions

File tree

.github/workflows/build.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,25 @@ jobs:
100100
cache-dependency-path: requirements.txt
101101

102102
- name: Install dependencies
103+
shell: bash
103104
run: |
104105
python -m pip install --upgrade pip
105106
pip install -r requirements.txt
106107
pip install pyinstaller
108+
# webrtcvad-wheels installs the `webrtcvad` module under the distribution
109+
# name `webrtcvad-wheels`, but PyInstaller's contrib hook hardcodes
110+
# copy_metadata('webrtcvad') and aborts the build when that lookup fails.
111+
# Alias the metadata under the `webrtcvad` name so the hook resolves it.
112+
python - <<'PY'
113+
import importlib.metadata as md
114+
import shutil
115+
dist = md.distribution("webrtcvad-wheels")
116+
info = dist._path
117+
alias = info.with_name("webrtcvad-%s.dist-info" % dist.version)
118+
if not alias.exists():
119+
shutil.copytree(info, alias)
120+
print("created metadata alias:", alias)
121+
PY
107122
108123
- name: Build executable with PyInstaller
109124
shell: bash

.readthedocs.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,21 @@
55
# Required
66
version: 2
77

8+
# Set the OS and tool versions used to build the docs (now required by RTD)
9+
build:
10+
os: ubuntu-22.04
11+
tools:
12+
python: "3.8"
13+
814
# Build documentation in the docs/ directory with Sphinx
915
sphinx:
1016
configuration: docs/conf.py
1117

1218
# Optionally build your docs in additional formats such as PDF and ePub
1319
formats: [pdf]
1420

15-
# Optionally set the version of Python and requirements required to build your docs
21+
# Optionally set the requirements required to build your docs
1622
python:
17-
version: 3.8
1823
install:
1924
- method: setuptools
2025
path: .

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FFsubsync
22
=======
33

4-
[![CI Status](https://github.com/smacke/ffsubsync/workflows/ffsubsync/badge.svg)](https://github.com/smacke/ffsubsync/actions)
4+
[![CI Status](https://github.com/smacke/ffsubsync/actions/workflows/ci.yml/badge.svg)](https://github.com/smacke/ffsubsync/actions/workflows/ci.yml)
55
[![Support Ukraine](https://badgen.net/badge/support/UKRAINE/?color=0057B8&labelColor=FFD700)](https://github.com/vshymanskyy/StandWithUkraine/blob/main/docs/README.md)
66
[![Checked with mypy](http://www.mypy-lang.org/static/mypy_badge.svg)](http://mypy-lang.org/)
77
[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)

0 commit comments

Comments
 (0)