Skip to content

Commit 5f1e712

Browse files
authored
Merge pull request #1657 from puremourning/update-third-party
Update third-party dependencies to latest
2 parents d3ae555 + a23622e commit 5f1e712

File tree

5 files changed

+12
-8
lines changed

5 files changed

+12
-8
lines changed

third_party/bottle

third_party/jedi_deps/jedi

Submodule jedi updated 94 files

ycmd/tests/python/subcommands_test.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,12 @@
3838
ChunkMatcher,
3939
LocationMatcher,
4040
ErrorMatcher,
41-
ExpectedFailure )
41+
ExpectedFailure,
42+
UnixOnly )
4243

4344
TYPESHED_PATH = os.path.normpath(
4445
PathToTestFile( '..', '..', '..', '..', 'third_party', 'jedi_deps', 'jedi',
45-
'jedi', 'third_party', 'typeshed', 'stdlib', '2and3', 'builtins.pyi' ) )
46+
'jedi', 'third_party', 'typeshed', 'stdlib', '3', 'builtins.pyi' ) )
4647

4748

4849
class JediDef:
@@ -154,7 +155,7 @@ def test_Subcommands_GoTo( self, app ):
154155
{ 'request': ( 'basic.py', 1, 4 ),
155156
'response': ( 'basic.py', 1, 1 ) },
156157
{ 'request': ( 'basic.py', 1, 12 ),
157-
'response': ( TYPESHED_PATH, 947, 7 ) },
158+
'response': ( TYPESHED_PATH, 742, 7 ) },
158159
{ 'request': ( 'basic.py', 2, 2 ),
159160
'response': ( 'basic.py', 1, 1 ) },
160161
# Class
@@ -381,7 +382,7 @@ def test_Subcommands_GetDoc_NoDocumentation( self, app ):
381382
def test_Subcommands_GoToType( self, app ):
382383
for test in [
383384
{ 'request': ( 'basic.py', 2, 1 ),
384-
'response': ( TYPESHED_PATH, 947, 7 ) },
385+
'response': ( TYPESHED_PATH, 742, 7 ) },
385386
{ 'request': ( 'basic.py', 8, 1 ),
386387
'response': ( 'basic.py', 4, 7 ) },
387388
{ 'request': ( 'basic.py', 3, 1 ),
@@ -699,6 +700,9 @@ def test_Subcommands_RefactorRename_StartOfFile( self, app ):
699700

700701

701702
@SharedYcmd
703+
# broken on windows in jedi 0.18.1:
704+
# https://github.com/davidhalter/jedi/issues/1877
705+
@UnixOnly
702706
def test_Subcommands_RefactorRename_MultiFIle( self, app ):
703707
one = PathToTestFile( 'rename', 'one.py' )
704708
two = PathToTestFile( 'rename', 'two.py' )

0 commit comments

Comments
 (0)