From 7053bfbeb7843986d066981062e695d3dd5dce06 Mon Sep 17 00:00:00 2001 From: icmor <54549777+icmor@users.noreply.github.com> Date: Sat, 12 Dec 2020 00:55:43 -0500 Subject: [PATCH 1/2] Add "python3" to possible names for the python binary Followed lang/python/config.el which already checks for python3 when setting the python-shell-interpreter. Python version naming is a hot mess: https://www.python.org/dev/peps/pep-0394/ --- modules/lang/python/doctor.el | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/lang/python/doctor.el b/modules/lang/python/doctor.el index 546df9a8d..d1d2c08e4 100644 --- a/modules/lang/python/doctor.el +++ b/modules/lang/python/doctor.el @@ -4,10 +4,12 @@ (featurep! :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") (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")))) (when (featurep! +pyenv) From 09f3597069f73b4a2b901156a877dc40172c3db2 Mon Sep 17 00:00:00 2001 From: icmor <54549777+icmor@users.noreply.github.com> Date: Sat, 12 Dec 2020 01:01:45 -0500 Subject: [PATCH 2/2] Update link for nose.el Switched from melpa -> emacsmirror. --- modules/lang/python/README.org | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/lang/python/README.org b/modules/lang/python/README.org index 2ae54de86..41b2aafb1 100644 --- a/modules/lang/python/README.org +++ b/modules/lang/python/README.org @@ -36,7 +36,7 @@ Adds Python support to Doom Emacs. + [[https://github.com/pythonic-emacs/anaconda-mode][anaconda-mode]]* + [[https://github.com/Wilfred/pyimport][pyimport]]* + [[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/Wilfred/pip-requirements.el][pip-requirements]]* + [[https://github.com/pwalsh/pipenv.el][pipenv]]*