Merge pull request #4409 from icmor/develop
Add "python3" to possible names for the python binary
This commit is contained in:
commit
91ced79975
2 changed files with 5 additions and 3 deletions
|
@ -36,7 +36,7 @@ Adds Python support to Doom Emacs.
|
||||||
+ [[https://github.com/pythonic-emacs/anaconda-mode][anaconda-mode]]*
|
+ [[https://github.com/pythonic-emacs/anaconda-mode][anaconda-mode]]*
|
||||||
+ [[https://github.com/Wilfred/pyimport][pyimport]]*
|
+ [[https://github.com/Wilfred/pyimport][pyimport]]*
|
||||||
+ [[https://github.com/paetzke/py-isort.el][py-isort]]*
|
+ [[https://github.com/paetzke/py-isort.el][py-isort]]*
|
||||||
+ [[https://melpa.org/#/nose][nose]]*
|
+ [[https://github.com/emacsattic/nose/][nose]]*
|
||||||
+ [[https://github.com/wbolster/emacs-python-pytest][python-pytest]]*
|
+ [[https://github.com/wbolster/emacs-python-pytest][python-pytest]]*
|
||||||
+ [[https://github.com/Wilfred/pip-requirements.el][pip-requirements]]*
|
+ [[https://github.com/Wilfred/pip-requirements.el][pip-requirements]]*
|
||||||
+ [[https://github.com/pwalsh/pipenv.el][pipenv]]*
|
+ [[https://github.com/pwalsh/pipenv.el][pipenv]]*
|
||||||
|
|
|
@ -4,10 +4,12 @@
|
||||||
(featurep! :tools lsp))
|
(featurep! :tools lsp))
|
||||||
"This module requires (:tools lsp)")
|
"This module requires (:tools lsp)")
|
||||||
|
|
||||||
(if (not (executable-find "python"))
|
(if (not (or (executable-find "python")
|
||||||
|
(executable-find "python3")))
|
||||||
(error! "Couldn't find python in your PATH")
|
(error! "Couldn't find python in your PATH")
|
||||||
(unless (featurep! +lsp)
|
(unless (featurep! +lsp)
|
||||||
(unless (zerop (shell-command "python -c 'import setuptools'"))
|
(unless (or (zerop (shell-command "python -c 'import setuptools'"))
|
||||||
|
(zerop (shell-command "python3 -c 'import setuptools'")))
|
||||||
(warn! "setuptools wasn't detected, which anaconda-mode requires"))))
|
(warn! "setuptools wasn't detected, which anaconda-mode requires"))))
|
||||||
|
|
||||||
(when (featurep! +pyenv)
|
(when (featurep! +pyenv)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue