wgester/dotfiles
1
0
Fork 0
forked from colonelpanic/dotfiles
Code Pull Requests Activity

Remove (imalison:set-pytest-command)

Browse Source
This commit is contained in:
Ivan Malison 2015-08-02 15:37:16 -07:00
parent 5d3e50f053
commit aab47a4607
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dotfiles/emacs.d/init.el
View File

@ -1636,15 +1636,6 @@ window is active in the perspective."
(progn (progn
(use-package pymacs :ensure t) (use-package pymacs :ensure t)
(use-package sphinx-doc :ensure t) (use-package sphinx-doc :ensure t)
(defun imalison:set-pytest-command ()
(let* ((project-root (imalison:project-root-or-current-directory))
(virtual-envs (get-virtual-envs))
(virtual-env (when virtual-envs (car virtual-envs))))
(when project-root
(setq pytest-global-name
(if (file-exists-p (concat project-root "tox.ini"))
"tox --"
(format "source %s; py.test" (concat virtual-env "bin/activate")))))))
(defun imalison:python-mode () (defun imalison:python-mode ()
(setq show-trailing-whitespace t) (setq show-trailing-whitespace t)
(if use-python-tabs (python-tabs)) (if use-python-tabs (python-tabs))
@ -1653,7 +1644,6 @@ window is active in the perspective."
;; Will this work with elpy. Seems like elpy has its own ;; Will this work with elpy. Seems like elpy has its own
;; mechanism for handling this ;; mechanism for handling this
;; (add-virtual-envs-to-jedi-server) ;; (add-virtual-envs-to-jedi-server)
(imalison:set-pytest-command)
(remove-hook 'completion-at-point-functions (remove-hook 'completion-at-point-functions
'python-completion-complete-at-point 'local) 'python-completion-complete-at-point 'local)
(add-to-list 'company-backends 'company-jedi)) (add-to-list 'company-backends 'company-jedi))