Skip to content
Snippets Groups Projects
Commit 342b7acc authored by Amir MOHAMMADI's avatar Amir MOHAMMADI
Browse files

Remove ffmpeg and openh264 from our channel in favor of defaults

parent edf10195
No related branches found
No related tags found
1 merge request!174Remove ffmpeg and openh264 from our channel in favor of defaults
Pipeline #44601 passed
...@@ -25,7 +25,19 @@ SUBDIRS = ( ...@@ -25,7 +25,19 @@ SUBDIRS = (
) )
REMOVALS = { REMOVALS = {
"osx-64": {}, "osx-64": {
"openh264-1.7.0-h18e5fc6_2.conda",
"openh264-1.7.0-h89e8454_1.tar.bz2",
"ffmpeg-2.8.10-0.tar.bz2",
"ffmpeg-2.8.10-1.tar.bz2",
"ffmpeg-2.8.10-2.tar.bz2",
"ffmpeg-2.8.10-3.tar.bz2",
"ffmpeg-2.8.10-4.tar.bz2",
"ffmpeg-3.4-h3b64a03_1.tar.bz2",
"ffmpeg-4.0-h18e5fc6_2.conda",
"ffmpeg-4.0-h2047f9e_1.tar.bz2",
"ffmpeg-4.0-he86247c_0.tar.bz2",
},
"linux-64": { "linux-64": {
"kaldi-1!5.5.164-h93a79c4_1.conda", "kaldi-1!5.5.164-h93a79c4_1.conda",
"kaldi-1!5.5.164-h13f0c7c_0.conda", "kaldi-1!5.5.164-h13f0c7c_0.conda",
...@@ -33,6 +45,17 @@ REMOVALS = { ...@@ -33,6 +45,17 @@ REMOVALS = {
"kaldi-2017.03.13-h6bb2d05_3.tar.bz2", "kaldi-2017.03.13-h6bb2d05_3.tar.bz2",
"kaldi-r7271.1a4dbf6-h6bb2d05_2.tar.bz2", "kaldi-r7271.1a4dbf6-h6bb2d05_2.tar.bz2",
"kaldi-r7271.1a4dbf6-0.tar.bz2", "kaldi-r7271.1a4dbf6-0.tar.bz2",
"openh264-1.7.0-hc521636_1.tar.bz2",
"openh264-1.7.0-hf6c5f75_2.conda",
"ffmpeg-2.8.10-0.tar.bz2",
"ffmpeg-2.8.10-1.tar.bz2",
"ffmpeg-2.8.10-2.tar.bz2",
"ffmpeg-2.8.10-3.tar.bz2",
"ffmpeg-2.8.10-4.tar.bz2",
"ffmpeg-3.4-hdec9c9a_1.tar.bz2",
"ffmpeg-4.0-hadceb68_1.tar.bz2",
"ffmpeg-4.0-hdb0e523_0.tar.bz2",
"ffmpeg-4.0-hf6c5f75_2.conda",
}, },
"noarch": {}, "noarch": {},
} }
......
from gen_patch_json import REMOVALS
from gen_patch_json import _gen_patch_instructions from gen_patch_json import _gen_patch_instructions
...@@ -25,5 +24,3 @@ def test_gen_patch_instructions(): ...@@ -25,5 +24,3 @@ def test_gen_patch_instructions():
"a": {"depends": ["c", "d", "e"], "features": None}, "a": {"depends": ["c", "d", "e"], "features": None},
"c": {"addthis": "yes"}, "c": {"addthis": "yes"},
} }
assert set(REMOVALS["osx-64"]) <= set(inst["remove"])
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment