Git-Mirrors/brozzler
1
0
Fork 0
mirror of https://github.com/internetarchive/brozzler.git synced 2025-08-07 22:12:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'ydl-stitched' into qa

Browse source 
* ydl-stitched:
  fix failing tests
  test for youtube-dl stitch-up
  add missing imports and fix mimetype issue
  move youtube-dl code into separate file
  push youtube-dl's stitched up videos to warcprox
This commit is contained in:
Noah Levitt 2018-08-16 12:10:44 -07:00
commit cbeba3a6b9
13 changed files with 442 additions and 218 deletions
Download patch file Download diff file Expand all files Collapse all files

3
setup.py
View file

@ -67,7 +67,7 @@ setuptools.setup(
'youtube-dl',
'reppy==0.3.4',
'requests',
'websocket-client!=0.39.0',
'websocket-client!=0.39.0,!=0.49.0',
'pillow>=5.2.0',
'urlcanon>=0.1.dev23',
'doublethink>=0.2.0.dev88',
@ -75,6 +75,7 @@ setuptools.setup(
'cerberus==1.0.1',
'jinja2',
'cryptography!=2.1.1', # 2.1.1 installation is failing on ubuntu
'python-magic',
],
extras_require={
'dashboard': ['flask>=0.11', 'gunicorn'],