Merge d57120c into 8ec8386

ycm-core · Dec 28, 2015 · 41b97aa · 41b97aa
2 parents 8ec8386 + d57120c
commit 41b97aa
Show file tree

Hide file tree

Showing 16 changed files with 400 additions and 88 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,9 +1,6 @@
 [submodule "third_party/OmniSharpServer"]
 	path = third_party/OmniSharpServer
 	url = https://github.com/nosami/OmniSharpServer
-[submodule "third_party/jedi"]
-	path = third_party/jedi
-	url = https://github.com/davidhalter/jedi
 [submodule "third_party/argparse"]
 	path = third_party/argparse
 	url = https://github.com/bewest/argparse
@@ -25,3 +22,6 @@
 [submodule "third_party/tern"]
 	path = third_party/tern
 	url = https://github.com/ternjs/tern.git
+[submodule "third_party/JediHTTP"]
+	path = third_party/JediHTTP
+	url = https://github.com/vheon/JediHTTP
diff --git a/test_requirements.txt b/test_requirements.txt
@@ -4,3 +4,4 @@ nose>=1.3.0
 PyHamcrest>=1.8.0
 WebTest>=2.0.9
 ordereddict>=1.1
+unittest2>=1.1.0
diff --git a/third_party/JediHTTP b/third_party/JediHTTP
diff --git a/third_party/jedi b/third_party/jedi