8000 Merge remote-tracking branch 'origin/master' into AddCropFilter · Powercoder64/ffmpeg-python@0d11238 · GitHub
[go: up one dir, main page]
Skip to content

Commit 0d11238

Browse files
kkroeningkkroening
committed
Merge remote-tracking branch 'origin/master' into AddCropFilter
2 parents 00fb91a + 7a44e54 commit 0d11238

File tree

3 files changed

+36
-10
lines changed

3 files changed

+36
-10
lines changed

‎.travis.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
language: python
22
before_install:
33
- >
4-
[ -f ffmpeg-3.3.1-64bit-static/ffmpeg ] || (
5-
curl -O https://johnvansickle.com/ffmpeg/releases/ffmpeg-3.3.1-64bit-static.tar.xz &&
6-
tar Jxf ffmpeg-3.3.1-64bit-static.tar.xz
4+
[ -f ffmpeg-release/ffmpeg ] || (
5+
curl -O https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-64bit-static.tar.xz &&
6+
mkdir -p ffmpeg-release &&
7+
tar Jxf ffmpeg-release-64bit-static.tar.xz --strip-components=1 -C ffmpeg-release
78
)
89
matrix:
910
include:
@@ -28,9 +29,9 @@ matrix:
2829
install:
2930
- pip install tox
3031
script:
31-
- export PATH=$(readlink -f ffmpeg-3.3.1-64bit-static):$PATH
32+
- export PATH=$(readlink -f ffmpeg-release):$PATH
3233
- tox -e $TOX_ENV
3334
cache:
3435
directories:
3536
- .tox
36-
- ffmpeg-3.3.1-64bit-static
37+
- ffmpeg-release

‎requirements-base.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
future
2+
pytest
3+
pytest-runner
4+
sphinx
5+
tox

‎requirements.txt

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,25 @@
1-
future
2-
pytest
3-
pytest-runner
4-
sphinx
5-
tox
1+
alabaster==0.7.10
2+
Babel==2.5.1
3+
certifi==2017.7.27.1
4+
chardet==3.0.4
5+
docutils==0.14
6+
future==0.16.0
7+
idna==2.6
8+
imagesize==0.7.1
9+
Jinja2==2.9.6
10+
MarkupSafe==1.0
11+
pluggy==0.5.2
12+
py==1.4.34
13+
Pygments==2.2.0
14+
pytest==3.2.3
15+
pytest-runner==3.0
16+
pytz==2017.3
17+
requests==2.18.4
18+
six==1.11.0
19+
snowballstemmer==1.2.1
20+
Sphinx==1.6.5
21+
sphinxcontrib-websupport==1.0.1
22+
tox==2.9.1
23+
typing==3.6.2
24+
urllib3==1.22
25+
virtualenv==15.1.0

0 commit comments

Comments
 (0)
0