emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Back to anaconda-mode, it's simply more mature atm

Browse source
This commit is contained in:
Henrik Lissner 2015-11-20 03:58:36 -05:00
parent 5193970d8f
commit f3e6fa58fc
2 changed files with 16 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Cask
View file

@ -172,7 +172,6 @@
;; Python -- modules/module-python.el ;; Python -- modules/module-python.el
(depends-on "anaconda-mode") (depends-on "anaconda-mode")
(depends-on "nose") (depends-on "nose")
(depends-on "company-jedi")
;; Ruby -- modules/module-regex.el ;; Ruby -- modules/module-regex.el
(depends-on "pcre2el") (depends-on "pcre2el")

34
modules/module-python.el
View file

@ -14,13 +14,7 @@
(define-env-command! python-mode "python --version | cut -d' ' -f2") (define-env-command! python-mode "python --version | cut -d' ' -f2")
;; interferes with smartparens ;; interferes with smartparens
(define-key python-mode-map (kbd "DEL") nil) (define-key python-mode-map (kbd "DEL") nil))
(after! company
(require 'company-jedi)
(unless (file-exists-p (concat python-environment-directory python-environment-default-root-name))
(jedi:install-server))
(define-company-backend! python-mode (jedi))))
(use-package nose (use-package nose
:commands nose-mode :commands nose-mode
@ -29,14 +23,13 @@
(associate! nose-mode :pattern "/test_.+\\.py\\'") (associate! nose-mode :pattern "/test_.+\\.py\\'")
:config :config
(bind! :map nose-mode-map (bind! :map nose-mode-map
(:prefix "," :n ",tr" 'nosetests-again
:n "tr" 'nosetests-again :n ",ta" 'nosetests-all
:n "ta" 'nosetests-all :n ",ts" 'nosetests-one
:n "ts" 'nosetests-one :n ",tv" 'nosetests-module
:n "tv" 'nosetests-module :n ",tA" 'nosetests-pdb-all
:n "tA" 'nosetests-pdb-all :n ",tO" 'nosetests-pdb-one
:n "tO" 'nosetests-pdb-one :n ",tV" 'nosetests-pdb-module))
:n "tV" 'nosetests-pdb-module)))
(use-package anaconda-mode (use-package anaconda-mode
:diminish anaconda-mode :diminish anaconda-mode
@ -44,12 +37,15 @@
:functions (anaconda-mode-running-p) :functions (anaconda-mode-running-p)
:init :init
(add-hook! python-mode '(anaconda-mode eldoc-mode)) (add-hook! python-mode '(anaconda-mode eldoc-mode))
(setq anaconda-mode-installation-directory (concat narf-temp-dir "anaconda/"))
:config :config
(bind! :map anaconda-mode-map :m "gd" 'anaconda-mode-goto-definitions) (bind! :map anaconda-mode-map :m "gd" 'anaconda-mode-goto-definitions)
(bind! :map anaconda-nav-mode-map :n [escape] 'anaconda-nav-quit) (bind! :map anaconda-nav-mode-map :n [escape] 'anaconda-nav-quit)
(advice-add 'anaconda-mode-doc-buffer :after 'narf*anaconda-mode-doc-buffer) (advice-add 'anaconda-mode-doc-buffer :after 'narf*anaconda-mode-doc-buffer)
(require 'company-anaconda)
(define-company-backend! python-mode (anaconda))
(after! emr (after! emr
(mapc (lambda (x) (mapc (lambda (x)
(let ((command-name (car x)) (let ((command-name (car x))
@ -61,9 +57,11 @@
(not (sp-point-in-string-or-comment))))) (not (sp-point-in-string-or-comment)))))
(emr-declare-command (intern (format "anaconda-mode-%s" (symbol-name command-name))) (emr-declare-command (intern (format "anaconda-mode-%s" (symbol-name command-name)))
:title title :modes 'python-mode :predicate predicate))) :title title :modes 'python-mode :predicate predicate)))
'((view-doc "view documentation" t) '((show-doc "view documentation" t)
(goto-assignments "go to assignments" t) (find-assignments "find assignments" t)
(usages "show usages" nil))))) (find-definitions "find definitions" t)
(find-file "find assignments" t)
(find-references "show usages" nil)))))
(provide 'module-python) (provide 'module-python)
;;; module-python.el ends here ;;; module-python.el ends here