Merge with master

The deprecation of Python2.6 and the insertion of environments made it quite difficult to merge.
This commit is contained in:
Dave Halter
2018-01-20 18:58:43 +01:00
48 changed files with 205 additions and 210 deletions
-4
View File
@@ -24,10 +24,6 @@ setenv =
env37: JEDI_TEST_ENVIRONMENT=37
commands =
py.test {posargs:jedi test}
[testenv:py26]
deps =
unittest2
{[testenv]deps}
[testenv:py27]
deps =
# for testing the typing module