|
|
@ -30,9 +30,10 @@ |
|
|
|
(setq jedi:complete-on-dot t) |
|
|
|
(setq jedi:complete-on-dot t) |
|
|
|
|
|
|
|
|
|
|
|
;; Enable pyenv integration. |
|
|
|
;; Enable pyenv integration. |
|
|
|
|
|
|
|
(if (executable-find "pyenv") |
|
|
|
(use-package pyenv-mode |
|
|
|
(use-package pyenv-mode |
|
|
|
:config |
|
|
|
:config |
|
|
|
(pyenv-mode)) |
|
|
|
(pyenv-mode))) |
|
|
|
|
|
|
|
|
|
|
|
;; Disable elpy default virtualenv (use the pyenv one) |
|
|
|
;; Disable elpy default virtualenv (use the pyenv one) |
|
|
|
(setq elpy-rpc-virtualenv-path 'current) |
|
|
|
(setq elpy-rpc-virtualenv-path 'current) |
|
|
@ -50,7 +51,8 @@ |
|
|
|
(flycheck-mode t))) |
|
|
|
(flycheck-mode t))) |
|
|
|
|
|
|
|
|
|
|
|
;; Activate pyenv automatically if a .python-version is supplied |
|
|
|
;; Activate pyenv automatically if a .python-version is supplied |
|
|
|
(add-hook 'python-mode-hook 'pyenv-activate-current-project) |
|
|
|
(if (executable-find "pyenv") |
|
|
|
|
|
|
|
(add-hook 'python-mode-hook 'pyenv-activate-current-project)) |
|
|
|
|
|
|
|
|
|
|
|
;; Add company-jedi hook to python mode |
|
|
|
;; Add company-jedi hook to python mode |
|
|
|
(add-hook 'python-mode-hook (lambda () |
|
|
|
(add-hook 'python-mode-hook (lambda () |
|
|
|