TakeV
/
spacemacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[python] Make ipython version detection more robust 

The version string may return an empty string in that
case we treat this like a legacy version.
This commit is contained in:
Maxi Wolff 2021-09-29 21:08:51 +02:00
parent f5bd49cc8e
commit d5cee22116
No known key found for this signature in database
GPG Key ID: 2DD07025BFDBD89A
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
layers/+lang/python/funcs.el
View File

@ -26,8 +26,8 @@
(let ((root-path (locate-dominating-file default-directory "pyproject.toml")))
(when root-path
(message "Poetry configuration file found. Activating virtual environment.")
(poetry-venv-workon))
))
(poetry-venv-workon))))
(defun spacemacs//python-setup-backend ()
"Conditionally setup python backend."
@ -152,13 +152,19 @@ as the pyenv version then also return nil. This works around https://github.com/
(defun spacemacs//python-setup-shell (&rest args)
(if (spacemacs/pyenv-executable-find "ipython")
(progn (setq python-shell-interpreter "ipython")
(if (version< (replace-regexp-in-string "\\(\\.dev\\)?[\r\n|\n]$" "" (shell-command-to-string (format "\"%s\" --version" (string-trim (spacemacs/pyenv-executable-find "ipython"))))) "5")
(setq python-shell-interpreter-args "-i")
(setq python-shell-interpreter-args "--simple-prompt -i")))
(progn
(setq python-shell-interpreter "ipython")
(let ((version (replace-regexp-in-string "\\(\\.dev\\)?[\r\n|\n]$" ""
(shell-command-to-string
(format "\"%s\" --version"
(string-trim (spacemacs/pyenv-executable-find "ipython")))))))
(if (or (version< version "5")
(string-blank-p version))
(setq python-shell-interpreter-args "-i")
(setq python-shell-interpreter-args "--simple-prompt -i"))))
(progn
(setq python-shell-interpreter-args "-i")
(setq python-shell-interpreter "python"))))
(setq python-shell-interpreter-args "-i"
python-shell-interpreter "python"))))
(defun spacemacs//python-setup-checkers (&rest args)