Merge remote-tracking branch 'origin/master' into AddCropFilter

.travis.yml

@@ -1,9 +1,10 @@
 language: python
 before_install:
   - >
-    [ -f ffmpeg-3.3.1-64bit-static/ffmpeg ] || (
+    [ -f ffmpeg-release/ffmpeg ] || (
-        curl -O https://johnvansickle.com/ffmpeg/releases/ffmpeg-3.3.1-64bit-static.tar.xz &&
+        curl -O https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-64bit-static.tar.xz &&
-        tar Jxf ffmpeg-3.3.1-64bit-static.tar.xz
+        mkdir -p ffmpeg-release &&
+        tar Jxf ffmpeg-release-64bit-static.tar.xz --strip-components=1 -C ffmpeg-release
     )
 matrix:
   include:
@@ -28,9 +29,9 @@ matrix:
 install:
   - pip install tox
 script:
-  - export PATH=$(readlink -f ffmpeg-3.3.1-64bit-static):$PATH
+  - export PATH=$(readlink -f ffmpeg-release):$PATH
   - tox -e $TOX_ENV
 cache:
   directories:
     - .tox
-    - ffmpeg-3.3.1-64bit-static
+    - ffmpeg-release

requirements-base.txt

@@ -0,0 +1,5 @@
+future
+pytest
+pytest-runner
+sphinx
+tox

requirements.txt

@@ -1,5 +1,25 @@
-future
+alabaster==0.7.10
-pytest
+Babel==2.5.1
-pytest-runner
+certifi==2017.7.27.1
-sphinx
+chardet==3.0.4
-tox
+docutils==0.14
+future==0.16.0
+idna==2.6
+imagesize==0.7.1
+Jinja2==2.9.6
+MarkupSafe==1.0
+pluggy==0.5.2
+py==1.4.34
+Pygments==2.2.0
+pytest==3.2.3
+pytest-runner==3.0
+pytz==2017.3
+requests==2.18.4
+six==1.11.0
+snowballstemmer==1.2.1
+Sphinx==1.6.5
+sphinxcontrib-websupport==1.0.1
+tox==2.9.1
+typing==3.6.2
+urllib3==1.22
+virtualenv==15.1.0