Skip to content

Commit 5e866e4

Browse files
synesthesiamsynesthesiam
committed
Refactor into a single package
1 parent 02c3e4c commit 5e866e4

Some content is hidden

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

94 files changed

+198
-2867
lines changed

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ dist/
1212
.venv/
1313
*.wav
1414
*.spec
15+
*.egg-info/
16+
.ipynb_checkpoints/
1517

1618
/samples/
1719
/voices/

‎Dockerfile

+4-3
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,10 @@ WORKDIR /home/mimic3/app
4747

4848
COPY wheels/ ./wheels/
4949

50-
COPY opentts-abc/ ./opentts-abc/
51-
COPY mimic3-http/ ./mimic3-http/
52-
COPY mimic3-tts/ ./mimic3-tts/
50+
COPY opentts_abc/ ./opentts_abc/
51+
COPY mimic3_http/ ./mimic3_http/
52+
COPY mimic3_tts/ ./mimic3_tts/
53+
COPY LICENSE MANIFEST.in README.md setup.py requirements.txt ./
5354
COPY install.sh ./
5455

5556
# Install mimic3

‎Dockerfile.debian

+7-6
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,10 @@ WORKDIR /build/mimic3
4545

4646
COPY wheels/ ./wheels/
4747

48-
COPY opentts-abc/ ./opentts-abc/
49-
COPY mimic3-http/ ./mimic3-http/
50-
COPY mimic3-tts/ ./mimic3-tts/
48+
COPY opentts_abc/ ./opentts_abc/
49+
COPY mimic3_http/ ./mimic3_http/
50+
COPY mimic3_tts/ ./mimic3_tts/
51+
COPY LICENSE MANIFEST.in README.md setup.py requirements.txt ./
5152
COPY install.sh ./
5253

5354
# Install mimic3
@@ -119,7 +120,7 @@ COPY debian/ debian/
119120
COPY voices/ voices/
120121

121122
RUN mkdir -p "${package_dir}/DEBIAN" && \
122-
export VERSION="$(cat mimic3-tts/mimic3_tts/VERSION)" && \
123+
export VERSION="$(cat mimic3_tts/VERSION)" && \
123124
envsubst \
124125
< "debian/control.in.${TARGETARCH}${TARGETVARIANT}" \
125126
> "${package_dir}/DEBIAN/control" && \
@@ -149,12 +150,12 @@ RUN --mount=type=cache,id=apt-run,target=/var/cache/apt \
149150
mkdir -p /var/cache/apt/${TARGETARCH}${TARGETVARIANT}/archives/partial && \
150151
apt-get update && \
151152
apt-get install --yes --no-install-recommends \
152-
dpkg-dev
153+
dpkg-dev python3
153154

154155
WORKDIR /test
155156

156157
COPY --from=build /package/*.deb ./
157-
COPY mimic3-tts/mimic3_tts/VERSION ./
158+
COPY mimic3_tts/VERSION ./
158159

159160
# Install mimic3 for current architecture
160161
RUN --mount=type=cache,id=apt-run,target=/var/cache/apt \

‎Dockerfile.debian.dockerignore

+19-24
Original file line numberDiff line numberDiff line change
@@ -9,36 +9,31 @@
99
!voices/
1010
!wheels/
1111

12+
!setup.py
13+
!LICENSE
14+
!MANIFEST.in
15+
!README.md
16+
!requirements.txt
17+
1218
# Debian packaging
1319
!debian/control.in.*
1420
!debian/bin/*
1521

1622
# opentts-abc
17-
!opentts-abc/setup.py
18-
!opentts-abc/LICENSE
19-
!opentts-abc/MANIFEST.in
20-
!opentts-abc/opentts_abc/*.py
21-
!opentts-abc/opentts_abc/VERSION
22-
!opentts-abc/opentts_abc/py.typed
23+
!opentts_abc/*.py
24+
!opentts_abc/VERSION
25+
!opentts_abc/py.typed
2326

2427
# Mimic 3 TTS
25-
!mimic3-tts/setup.py
26-
!mimic3-tts/LICENSE
27-
!mimic3-tts/MANIFEST.in
28-
!mimic3-tts/requirements.txt
29-
!mimic3-tts/mimic3_tts/*.py
30-
!mimic3-tts/mimic3_tts/voices.json
31-
!mimic3-tts/mimic3_tts/VERSION
32-
!mimic3-tts/mimic3_tts/py.typed
28+
!mimic3_tts/*.py
29+
!mimic3_tts/voices.json
30+
!mimic3_tts/VERSION
31+
!mimic3_tts/py.typed
3332

3433
# HTTP server
35-
!mimic3-http/setup.py
36-
!mimic3-http/LICENSE
37-
!mimic3-http/MANIFEST.in
38-
!mimic3-http/requirements.txt
39-
!mimic3-http/mimic3_http/css/
40-
!mimic3-http/mimic3_http/img/
41-
!mimic3-http/mimic3_http/templates/
42-
!mimic3-http/mimic3_http/*.py
43-
!mimic3-http/mimic3_http/VERSION
44-
!mimic3-http/mimic3_http/py.typed
34+
!mimic3_http/css/
35+
!mimic3_http/img/
36+
!mimic3_http/templates/
37+
!mimic3_http/*.py
38+
!mimic3_http/VERSION
39+
!mimic3_http/py.typed

‎Dockerfile.dist

+5-4
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,10 @@ WORKDIR /build/mimic3
3939

4040
COPY wheels/ ./wheels/
4141

42-
COPY opentts-abc/ ./opentts-abc/
43-
COPY mimic3-http/ ./mimic3-http/
44-
COPY mimic3-tts/ ./mimic3-tts/
42+
COPY opentts_abc/ ./opentts_abc/
43+
COPY mimic3_http/ ./mimic3_http/
44+
COPY mimic3_tts/ ./mimic3_tts/
45+
COPY LICENSE MANIFEST.in README.md setup.py requirements.txt ./
4546
COPY build-dist.sh ./
4647

4748
# Create sdists
@@ -84,7 +85,7 @@ RUN --mount=type=cache,id=pip-requirements,target=/root/.cache/pip \
8485
-f wheels/ \
8586
-f https://synesthesiam.github.io/prebuilt-apps/ \
8687
-f dist/ \
87-
mimic3-tts
88+
mycroft-mimic3-tts
8889

8990
# Download default voice
9091
COPY voices/ /root/.local/share/mimic3/voices/

‎Dockerfile.dist.dockerignore

+19-24
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,27 @@
77
!wheels/
88
!debian/control.in.*
99

10+
!setup.py
11+
!LICENSE
12+
!MANIFEST.in
13+
!README.md
14+
!requirements.txt
15+
1016
# opentts-abc
11-
!opentts-abc/setup.py
12-
!opentts-abc/LICENSE
13-
!opentts-abc/MANIFEST.in
14-
!opentts-abc/opentts_abc/*.py
15-
!opentts-abc/opentts_abc/VERSION
16-
!opentts-abc/opentts_abc/py.typed
17+
!opentts_abc/*.py
18+
!opentts_abc/VERSION
19+
!opentts_abc/py.typed
1720

1821
# Mimic 3 TTS
19-
!mimic3-tts/setup.py
20-
!mimic3-tts/LICENSE
21-
!mimic3-tts/MANIFEST.in
22-
!mimic3-tts/requirements.txt
23-
!mimic3-tts/mimic3_tts/*.py
24-
!mimic3-tts/mimic3_tts/voices.json
25-
!mimic3-tts/mimic3_tts/VERSION
26-
!mimic3-tts/mimic3_tts/py.typed
22+
!mimic3_tts/*.py
23+
!mimic3_tts/voices.json
24+
!mimic3_tts/VERSION
25+
!mimic3_tts/py.typed
2726

2827
# HTTP server
29-
!mimic3-http/setup.py
30-
!mimic3-http/LICENSE
31-
!mimic3-http/MANIFEST.in
32-
!mimic3-http/requirements.txt
33-
!mimic3-http/mimic3_http/css/
34-
!mimic3-http/mimic3_http/img/
35-
!mimic3-http/mimic3_http/templates/
36-
!mimic3-http/mimic3_http/*.py
37-
!mimic3-http/mimic3_http/VERSION
38-
!mimic3-http/mimic3_http/py.typed
28+
!mimic3_http/css/
29+
!mimic3_http/img/
30+
!mimic3_http/templates/
31+
!mimic3_http/*.py
32+
!mimic3_http/VERSION
33+
!mimic3_http/py.typed

‎Dockerfile.dockerignore

+19-24
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,27 @@
77
!wheels/
88
!debian/control.in.*
99

10+
!setup.py
11+
!LICENSE
12+
!MANIFEST.in
13+
!README.md
14+
!requirements.txt
15+
1016
# opentts-abc
11-
!opentts-abc/setup.py
12-
!opentts-abc/LICENSE
13-
!opentts-abc/MANIFEST.in
14-
!opentts-abc/opentts_abc/*.py
15-
!opentts-abc/opentts_abc/VERSION
16-
!opentts-abc/opentts_abc/py.typed
17+
!opentts_abc/*.py
18+
!opentts_abc/VERSION
19+
!opentts_abc/py.typed
1720

1821
# Mimic 3 TTS
19-
!mimic3-tts/setup.py
20-
!mimic3-tts/LICENSE
21-
!mimic3-tts/MANIFEST.in
22-
!mimic3-tts/requirements.txt
23-
!mimic3-tts/mimic3_tts/*.py
24-
!mimic3-tts/mimic3_tts/voices.json
25-
!mimic3-tts/mimic3_tts/VERSION
26-
!mimic3-tts/mimic3_tts/py.typed
22+
!mimic3_tts/*.py
23+
!mimic3_tts/voices.json
24+
!mimic3_tts/VERSION
25+
!mimic3_tts/py.typed
2726

2827
# HTTP server
29-
!mimic3-http/setup.py
30-
!mimic3-http/LICENSE
31-
!mimic3-http/MANIFEST.in
32-
!mimic3-http/requirements.txt
33-
!mimic3-http/mimic3_http/css/
34-
!mimic3-http/mimic3_http/img/
35-
!mimic3-http/mimic3_http/templates/
36-
!mimic3-http/mimic3_http/*.py
37-
!mimic3-http/mimic3_http/VERSION
38-
!mimic3-http/mimic3_http/py.typed
28+
!mimic3_http/css/
29+
!mimic3_http/img/
30+
!mimic3_http/templates/
31+
!mimic3_http/*.py
32+
!mimic3_http/VERSION
33+
!mimic3_http/py.typed

‎Dockerfile.gpu

+4-3
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,10 @@ RUN --mount=type=cache,id=apt-run,target=/var/cache/apt \
4040

4141
WORKDIR /home/mimic3/app
4242

43-
COPY opentts-abc/ ./opentts-abc/
44-
COPY mimic3-http/ ./mimic3-http/
45-
COPY mimic3-tts/ ./mimic3-tts/
43+
COPY opentts_abc/ ./opentts_abc/
44+
COPY mimic3_http/ ./mimic3_http/
45+
COPY mimic3_tts/ ./mimic3_tts/
46+
COPY LICENSE MANIFEST.in README.md setup.py requirements.txt ./
4647
COPY install.sh ./
4748

4849
# Use GPU version of onnxruntime

‎Dockerfile.gpu.dockerignore

+19-24
Original file line numberDiff line numberDiff line change
@@ -4,32 +4,27 @@
44
!tests/apope_sample_*.wav
55
!voices/
66

7+
!setup.py
8+
!LICENSE
9+
!MANIFEST.in
10+
!README.md
11+
!requirements.txt
12+
713
# opentts-abc
8-
!opentts-abc/setup.py
9-
!opentts-abc/LICENSE
10-
!opentts-abc/MANIFEST.in
11-
!opentts-abc/opentts_abc/*.py
12-
!opentts-abc/opentts_abc/VERSION
13-
!opentts-abc/opentts_abc/py.typed
14+
!opentts_abc/*.py
15+
!opentts_abc/VERSION
16+
!opentts_abc/py.typed
1417

1518
# Mimic 3 TTS
16-
!mimic3-tts/setup.py
17-
!mimic3-tts/LICENSE
18-
!mimic3-tts/MANIFEST.in
19-
!mimic3-tts/requirements.txt
20-
!mimic3-tts/mimic3_tts/*.py
21-
!mimic3-tts/mimic3_tts/voices.json
22-
!mimic3-tts/mimic3_tts/VERSION
23-
!mimic3-tts/mimic3_tts/py.typed
19+
!mimic3_tts/*.py
20+
!mimic3_tts/voices.json
21+
!mimic3_tts/VERSION
22+
!mimic3_tts/py.typed
2423

2524
# HTTP server
26-
!mimic3-http/setup.py
27-
!mimic3-http/LICENSE
28-
!mimic3-http/MANIFEST.in
29-
!mimic3-http/requirements.txt
30-
!mimic3-http/mimic3_http/css/
31-
!mimic3-http/mimic3_http/img/
32-
!mimic3-http/mimic3_http/templates/
33-
!mimic3-http/mimic3_http/*.py
34-
!mimic3-http/mimic3_http/VERSION
35-
!mimic3-http/mimic3_http/py.typed
25+
!mimic3_http/css/
26+
!mimic3_http/img/
27+
!mimic3_http/templates/
28+
!mimic3_http/*.py
29+
!mimic3_http/VERSION
30+
!mimic3_http/py.typed

‎Dockerfile.plugin.dockerignore

+19-24
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@
77
!wheels/
88
!debian/control.in.*
99

10+
!setup.py
11+
!LICENSE
12+
!MANIFEST.in
13+
!README.md
14+
!requirements.txt
15+
1016
# plugin-tts-mimic3
1117
!plugin-tts-mimic3/setup.py
1218
!plugin-tts-mimic3/LICENSE
@@ -17,31 +23,20 @@
1723
!plugin-tts-mimic3/plugin_tts_mimic3/py.typed
1824

1925
# opentts-abc
20-
!opentts-abc/setup.py
21-
!opentts-abc/LICENSE
22-
!opentts-abc/MANIFEST.in
23-
!opentts-abc/opentts_abc/*.py
24-
!opentts-abc/opentts_abc/VERSION
25-
!opentts-abc/opentts_abc/py.typed
26+
!opentts_abc/*.py
27+
!opentts_abc/VERSION
28+
!opentts_abc/py.typed
2629

2730
# Mimic 3 TTS
28-
!mimic3-tts/setup.py
29-
!mimic3-tts/LICENSE
30-
!mimic3-tts/MANIFEST.in
31-
!mimic3-tts/requirements.txt
32-
!mimic3-tts/mimic3_tts/*.py
33-
!mimic3-tts/mimic3_tts/voices.json
34-
!mimic3-tts/mimic3_tts/VERSION
35-
!mimic3-tts/mimic3_tts/py.typed
31+
!mimic3_tts/*.py
32+
!mimic3_tts/voices.json
33+
!mimic3_tts/VERSION
34+
!mimic3_tts/py.typed
3635

3736
# HTTP server
38-
!mimic3-http/setup.py
39-
!mimic3-http/LICENSE
40-
!mimic3-http/MANIFEST.in
41-
!mimic3-http/requirements.txt
42-
!mimic3-http/mimic3_http/css/
43-
!mimic3-http/mimic3_http/img/
44-
!mimic3-http/mimic3_http/templates/
45-
!mimic3-http/mimic3_http/*.py
46-
!mimic3-http/mimic3_http/VERSION
47-
!mimic3-http/mimic3_http/py.typed
37+
!mimic3_http/css/
38+
!mimic3_http/img/
39+
!mimic3_http/templates/
40+
!mimic3_http/*.py
41+
!mimic3_http/VERSION
42+
!mimic3_http/py.typed

‎Dockerfile.sample

+5-4
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,16 @@ RUN --mount=type=cache,id=apt-build,target=/var/cache/apt \
3838
apt-get update && \
3939
grep 'Depends:' "debian/control.in.${TARGETARCH}${TARGETVARIANT}" | cut -d' ' -f2- | sed -e 's/,/\n/g' | \
4040
xargs apt-get install --yes --no-install-recommends \
41-
python3 python3-pip python3-venv
41+
python3 python3-pip python3-venv build-essential
4242

4343
WORKDIR /home/mimic3/app
4444

4545
COPY wheels/ ./wheels/
4646

47-
COPY opentts-abc/ ./opentts-abc/
48-
COPY mimic3-http/ ./mimic3-http/
49-
COPY mimic3-tts/ ./mimic3-tts/
47+
COPY opentts_abc/ ./opentts_abc/
48+
COPY mimic3_http/ ./mimic3_http/
49+
COPY mimic3_tts/ ./mimic3_tts/
50+
COPY LICENSE MANIFEST.in README.md setup.py requirements.txt ./
5051
COPY install.sh ./
5152

5253
# Install mimic3

0 commit comments

Comments
 (0)