Call jediepcserver.py script directly

tkf · Mar 17, 2014 · 7efc1a3 · 7efc1a3
1 parent 451226d
commit 7efc1a3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -71,7 +71,7 @@ install-jedi-dev:
 	${PIP_INSTALL} --upgrade ${JEDI_DEV_URL}
 
 env: $(ENV)/$(BINDIR)/activate
-$(ENV)/$(BINDIR)/activate: ${ELPA_DIR} jedi.el setup.py
+$(ENV)/$(BINDIR)/activate: ${ELPA_DIR} jedi.el jediepcserver.py setup.py
 	${VIRTUAL_EMACS} -batch -l jedi.el -f "jedi:install-server-block"
 	test -f $@
 	touch $@

diff --git a/jedi.el b/jedi.el
@@ -78,8 +78,7 @@ to make this setting work."
   :group 'jedi)
 
 (defun jedi:-env-server-command ()
-  (let ((py (python-environment-bin "python" jedi:environment-root)))
-    (when py (list py jedi:server-script))))
+  (list (python-environment-bin "jediepcserver.py" jedi:environment-root)))
 
 (defcustom jedi:server-command
   (or (jedi:-env-server-command)
@@ -89,8 +88,7 @@ to make this setting work."
 If you setup Jedi requirements using `jedi:install-server' command,
 `jedi:server-command' should be automatically set to::
 
-    '(\"~/.emacs.d/.python-environments/default/bin/python\"
-      \"JEDI:SOURCE-DIR/jediepcserver.py\")
+    '(\"~/.emacs.d/.python-environments/default/bin/jediepcserver.py\")
 
 Otherwise, it should be set to::
 
@@ -1100,7 +1098,7 @@ what jedi can do."
 
 ;;; Virtualenv setup
 (defvar jedi:install-server--command
-  `("pip" "install" ,(convert-standard-filename jedi:source-dir)))
+  `("pip" "install" "--upgrade" ,(convert-standard-filename jedi:source-dir)))
 
 ;;;###autoload
 (defun jedi:install-server ()

diff --git a/jediepcserver.py b/jediepcserver.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
 """
 Jedi EPC server.