From 8750f253bfffbe5e3f4134bf6c5187c2e280061a Mon Sep 17 00:00:00 2001 From: baxtree Date: Mon, 5 Oct 2020 12:49:06 +0100 Subject: [PATCH] fix the installation on Ubuntu docker images and update Pipfile lock --- Pipfile.lock | 40 ++++++++++++++++++------------------ README.md | 12 ----------- docker/Dockerfile-Ubuntu18 | 2 ++ docker/Dockerfile-Ubuntu19 | 2 ++ docker/Dockerfile-Ubuntu20 | 2 ++ site/source/installation.rst | 4 ---- site/source/usage.rst | 5 ----- 7 files changed, 26 insertions(+), 41 deletions(-) diff --git a/Pipfile.lock b/Pipfile.lock index 56b1e2c..e6f68ca 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -933,40 +933,40 @@ }, "tensorboard": { "hashes": [ - "sha256:9a2a2dc9856187679e93f3c95e5dc771dd47e3257db09767b4be118d734b4dc2" + "sha256:d34609ed83ff01dd5b49ef81031cfc9c166bba0dabd60197024f14df5e8eae5e" ], - "version": "==2.2.1" + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1'", + "version": "==2.3.0" }, "tensorboard-plugin-wit": { "hashes": [ - "sha256:1fdf4ac343f1665453205aef8bb227b0204893bb5ffb792d2ed4509b1daf3d4f", - "sha256:243f117d117f9e81a21dc64b602b2bcb256ca5ba038867b96022d02271b17106" + "sha256:ee775f04821185c90d9a0e9c56970ee43d7c41403beb6629385b39517129685b" ], - "version": "==1.6.0.post3" + "version": "==1.7.0" }, "tensorflow": { "hashes": [ - "sha256:267017724a49c367ca5df536e5f6d3d59643eaed946c82233d6b371e62b5ddc8", - "sha256:3ee8819732d8594913b7d22ded7b22e48a49aa015050d8dd8464eaa010ba2e41", - "sha256:572f69d2d0a3d3d83ebfb2c24e6d73d88b85a09f5da796974ef4a0ad83ff7cde", - "sha256:6735486ee9c3cb0807476e2b36ef7a4cd6c597cb24abf496e66b703360e1e54e", - "sha256:68ea22aee9c269a6a0c1061c141f1ec1cd1b1be7569390519c1bf4773f434a40", - "sha256:784ab8217e4b0eb4d121c28430c6cdc2ce56c02634a9720d84fb30598b338b8c", - "sha256:7ed67b47cdf6598a79583de5b57c595493eac2b8b6b3a828f912354716cb8149", - "sha256:8f364528f70d895b96a0de36c7c6002644bf4c5df1ee3fbfa775f5cee6571ad7", - "sha256:bbcfb04738099bd46822db91584db74703fdddacf4cd0a76acfc5e086956b5ba", - "sha256:c332c7fc5cfd54cb86d5da99787c9693e3a924848097c54df1b71ee595a39c93", - "sha256:dc5548562308acde7931f040e73d46ae31b398924cf675c3486fd3504e00a4af", - "sha256:f5f27528570fc0d7b90668be10c5dfd90d6ceb8fd2ed62d7d679554acb616bfe" + "sha256:1f72edee9d2e8861edbb9e082608fd21de7113580b3fdaa4e194b472c2e196d0", + "sha256:4632c2c6c84ed3b5e29e4b292704a1a646e1aa06587b7a2404b6ecc99e07758a", + "sha256:68afc5f01f32827a53c23a9aa8cd404cdcf308e90942d4a8023e7f9e669a330a", + "sha256:8490c06c72d6b2227f0bda4800bfbe9004ade3f25f5ccaac2581531bf2885ab5", + "sha256:859afb9166ace41ee71f62938fc645981113bb3227b847c8cd2875549c9fa1dc", + "sha256:85c49c951d735c651ae989a6dd7a40ab8032317179d634f871e2e7556dc82a69", + "sha256:87750a476aa6f76b3aad5e6182faf2a3036a3d4c0db3b6d7463ebbaf4b184a23", + "sha256:87b62ab25816597a5e5352604b383b292eafd19a33ae7848b5275ea74fc4da1d", + "sha256:94c7d1916844fd7db53dd8d9b2c88b48119d39992ae542ec8a076d6f806cc989", + "sha256:b69a6f0a8e7158c3bc14b22ec0d03bd303e196644d5428094bacea0ed8507af7", + "sha256:cdce1f71f592d840dd3e05b67f1010f616311d9856250ff772db537f39ef2992", + "sha256:f4aa1dd6e7a040c29b3567ad1f4537aebeb58fcb6bafbc11f11c2c461d6fda63" ], "index": "pypi", - "version": "==2.2.0" + "version": "==2.3.1" }, "tensorflow-estimator": { "hashes": [ - "sha256:d09dacdd127f2579cea8d5af21f4a918036b8ae246adc82f26b61f91cc247dc2" + "sha256:b75e034300ccb169403cf2695adf3368da68863aeb0c14c3760064c713d5c486" ], - "version": "==2.2.0" + "version": "==2.3.0" }, "termcolor": { "hashes": [ diff --git a/README.md b/README.md index 393a9ce..e5e31ed 100644 --- a/README.md +++ b/README.md @@ -22,11 +22,6 @@ $ pip install subaligner ``` or ``` -# Install via pipx -pipx install subaligner -``` -or -``` # Install from GitHub via Pipenv ... [packages] @@ -67,13 +62,6 @@ or $ subaligner -m single -v video.mp4 -s subtitle.srt $ subaligner -m dual -v video.mp4 -s subtitle.srt -``` -``` -# Run alignments with pipx - -$ pipx run subaligner -m single -v video.mp4 -s subtitle.srt -$ pipx run subaligner -m dual -v video.mp4 -s subtitle.srt - ``` ``` # Run the module as a script diff --git a/docker/Dockerfile-Ubuntu18 b/docker/Dockerfile-Ubuntu18 index 342b2eb..267e31d 100644 --- a/docker/Dockerfile-Ubuntu18 +++ b/docker/Dockerfile-Ubuntu18 @@ -1,6 +1,8 @@ # Subaligner Ubuntu 18 Docker Image FROM ubuntu:18.04 +ARG DEBIAN_FRONTEND=noninteractive +ENV TZ=Europe/London RUN apt-get -y update &&\ apt-get -y install ffmpeg &&\ apt-get -y install espeak libespeak1 libespeak-dev espeak-data &&\ diff --git a/docker/Dockerfile-Ubuntu19 b/docker/Dockerfile-Ubuntu19 index 048b212..b363be8 100644 --- a/docker/Dockerfile-Ubuntu19 +++ b/docker/Dockerfile-Ubuntu19 @@ -1,6 +1,8 @@ # Subaligner Ubuntu 19 Docker Image FROM ubuntu:19.10 +ARG DEBIAN_FRONTEND=noninteractive +ENV TZ=Europe/London RUN apt-get -y update &&\ apt-get -y install ffmpeg &&\ apt-get -y install espeak libespeak1 libespeak-dev espeak-data &&\ diff --git a/docker/Dockerfile-Ubuntu20 b/docker/Dockerfile-Ubuntu20 index ad5bb9e..c5e30c8 100644 --- a/docker/Dockerfile-Ubuntu20 +++ b/docker/Dockerfile-Ubuntu20 @@ -1,6 +1,8 @@ # Subaligner Ubuntu 20 Docker Image FROM ubuntu:20.04 +ARG DEBIAN_FRONTEND=noninteractive +ENV TZ=Europe/London RUN apt-get -y update &&\ apt-get -y install ffmpeg &&\ apt-get -y install espeak libespeak1 libespeak-dev espeak-data &&\ diff --git a/site/source/installation.rst b/site/source/installation.rst index 4d2952f..a9e8e22 100644 --- a/site/source/installation.rst +++ b/site/source/installation.rst @@ -18,10 +18,6 @@ Installation $ pip install numpy $ pip install subaligner -**Install Subaligner via pipx**:: - - $ pipx install subaligner - **Install from GitHub via Pipenv**:: ... diff --git a/site/source/usage.rst b/site/source/usage.rst index 26c6922..ffbbddc 100644 --- a/site/source/usage.rst +++ b/site/source/usage.rst @@ -29,11 +29,6 @@ Make sure you have got the virtual environment activated upfront. $ docker run -v `pwd`:`pwd` -w `pwd` -it baxtree/subaligner subaligner_1pass -v video.mp4 -s subtitle.srt $ docker run -v `pwd`:`pwd` -w `pwd` -it baxtree/subaligner subaligner_2pass -v video.mp4 -s subtitle.srt -**Run alignments with pipx**:: - - $ pipx run subaligner -m single -v video.mp4 -s subtitle.srt - $ pipx run subaligner -m dual -v video.mp4 -s subtitle.srt - **Run the module as a script**:: $ python -m subaligner -m single -v video.mp4 -s subtitle.srt