Merge pull request #245 from cclauss/patch-1 · binluv1905/ffmpeg-python@8809a54 · GitHub

binluv1905 / ffmpeg-python Public

forked from kkroening/ffmpeg-python

• Notifications You must be signed in to change notification settings
• Fork 0
• Star 0

• Code
• Pull requests
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 8809a54

Browse filesBrowse the repository at this point in the historyBrowse files

kkroening

authored

Merge pull request kkroening#245 from cclauss/patch-1

Travis CI and tox.ini: Add Python 3.7 to the testing

2 parents b14785b + ed9b7f8 commit 8809a54
Copy full SHA for 8809a54

2 files changed

+9-11Lines changed: 9 additions & 11 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• .travis.yml
• tox.ini

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎.travis.yml‎

Copy file name to clipboardExpand all lines: .travis.yml

+8-10Lines changed: 8 additions & 10 deletions

Original file line number	Diff line number	Diff line change
@@ -9,20 +9,18 @@ before_install:
9	9	matrix:
10	10	include:
11	11	- python: 2.7
12		- env:
13		- - TOX_ENV=py27
	12	+ env: TOX_ENV=py27
14	13	- python: 3.4
15		- env:
16		- - TOX_ENV=py34
	14	+ env: TOX_ENV=py34
17	15	- python: 3.5
18		- env:
19		- - TOX_ENV=py35
	16	+ env: TOX_ENV=py35
20	17	- python: 3.6
21		- env:
22		- - TOX_ENV=py36
	18	+ env: TOX_ENV=py36
	19	+ - python: 3.7
	20	+ dist: xenial # required for Python >= 3.7
	21	+ env: TOX_ENV=py37
23	22	- python: pypy
24		- env:
25		- - TOX_ENV=pypy
	23	+ env: TOX_ENV=pypy
26	24	install:
27	25	- pip install tox
28	26	script:

Collapse file

‎tox.ini‎

Copy file name to clipboardExpand all lines: tox.ini

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -4,7 +4,7 @@
4	4	# and then run "tox" from this directory.
5	5
6	6	[tox]
7		- envlist = py27, py34, py35, py36, pypy
	7	+ envlist = py27, py34, py35, py36, py37, pypy
8	8
9	9	[testenv]
10	10	commands = py.test -vv

0 commit comments

Comments

0 (0)