VimPlug/jedi-fork
1
0
Fork 0
forked from VimPlug/jedi
Code Pull Requests Activity

Merge pull request #711 from WoLpH/python35

Browse Source 
Enabled python 3.5 support
This commit is contained in:
Dave Halter
2016-03-31 10:47:31 +02:00
parent ea099e514b 4afc74f1c7
commit da657fb132
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.travis.yml
View File

@@ -6,6 +6,7 @@ env:
- TOXENV=py32 - TOXENV=py32
- TOXENV=py33 - TOXENV=py33
- TOXENV=py34 - TOXENV=py34
- TOXENV=py35
- TOXENV=pypy - TOXENV=pypy
- TOXENV=cov - TOXENV=cov
- TOXENV=sith - TOXENV=sith
@@ -14,8 +15,9 @@ matrix:
- env: TOXENV=cov - env: TOXENV=cov
- env: TOXENV=sith - env: TOXENV=sith
- env: TOXENV=pypy - env: TOXENV=pypy
python: 3.5
install: install:
- pip install --quiet --use-mirrors tox - pip install --quiet tox 'virtualenv<14.0.0' 'pip<8.0.0'
script: script:
- tox - tox
after_script: after_script:
@@ -23,3 +25,4 @@ after_script:
pip install --quiet --use-mirrors coveralls; pip install --quiet --use-mirrors coveralls;
coveralls; coveralls;
fi fi

7
tox.ini
View File

@@ -1,5 +1,5 @@
[tox] [tox]
envlist = py26, py27, py32, py33, py34 envlist = py26, py27, py32, py33, py34, py35
[testenv] [testenv]
deps = deps =
pytest>=2.3.5 pytest>=2.3.5
@@ -18,6 +18,11 @@ commands =
deps = deps =
unittest2 unittest2
{[testenv]deps} {[testenv]deps}
[testenv:py32]
deps =
pip<8.0.0
virtualenv<14.0.0
{[testenv]deps}
[testenv:cov] [testenv:cov]
deps = deps =
coverage coverage