Merge with master

The deprecation of Python2.6 and the insertion of environments made it quite difficult to merge.
2018-01-20 19:32:59 +01:00
parent 19b3580ba7 877383b110
commit d986c44b94
48 changed files with 205 additions and 210 deletions
@@ -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