Merge pull request #2956 from tokilone/add-poetry-suport

Add Poetry support
This commit is contained in:
Henrik Lissner 2020-04-26 04:42:12 -04:00 committed by GitHub
commit 6520a4b45d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 1 deletions

View file

@ -129,7 +129,7 @@ Modules that bring support for a language or group of languages to Emacs.
+ [[file:../modules/lang/php/README.org][php]] =+lsp= - TODO + [[file:../modules/lang/php/README.org][php]] =+lsp= - TODO
+ plantuml - TODO + plantuml - TODO
+ purescript - TODO + purescript - TODO
+ [[file:../modules/lang/python/README.org][python]] =+lsp +pyenv +conda= - TODO + [[file:../modules/lang/python/README.org][python]] =+lsp +pyenv +conda +poetry= - TODO
+ qt - TODO + qt - TODO
+ racket - TODO + racket - TODO
+ [[file:../modules/lang/rest/README.org][rest]] - TODO + [[file:../modules/lang/rest/README.org][rest]] - TODO

View file

@ -25,6 +25,8 @@ Adds Python support to Doom Emacs.
+ ~+lsp~ Language Server Protocol support + ~+lsp~ Language Server Protocol support
+ ~+pyenv~ Python virtual environment support via [[https://github.com/pyenv/pyenv][pyenv]] + ~+pyenv~ Python virtual environment support via [[https://github.com/pyenv/pyenv][pyenv]]
+ ~+conda~ Python virtual environment support via [[https://conda.io/en/latest/][Conda]] + ~+conda~ Python virtual environment support via [[https://conda.io/en/latest/][Conda]]
+ ~+poetry~ Python packaging, dependency management, and virtual environment
support via [[https://python-poetry.org/][Poetry]]
+ ~+cython~ Cython files support via [[https://github.com/cython/cython/blob/master/Tools/cython-mode.el][Cython-mode]] + ~+cython~ Cython files support via [[https://github.com/cython/cython/blob/master/Tools/cython-mode.el][Cython-mode]]
** Plugins ** Plugins
@ -41,6 +43,8 @@ Adds Python support to Doom Emacs.
+ [[https://github.com/necaris/conda.el][conda]]* + [[https://github.com/necaris/conda.el][conda]]*
+ ~+pyenv~ + ~+pyenv~
+ [[https://github.com/pythonic-emacs/pyenv-mode][pyenv]]* + [[https://github.com/pythonic-emacs/pyenv-mode][pyenv]]*
+ ~+poetry~
+ [[https://github.com/galaunay/poetry.el][poetry]]*
+ ~+lsp~ and ~:tools lsp~ + ~+lsp~ and ~:tools lsp~
+ [[https://github.com/emacs-lsp/lsp-mode][lsp]] + [[https://github.com/emacs-lsp/lsp-mode][lsp]]
+ [[https://github.com/emacs-lsp/lsp-python-ms][lsp-python-ms]]* + [[https://github.com/emacs-lsp/lsp-python-ms][lsp-python-ms]]*
@ -67,6 +71,7 @@ This module has no direct prerequisites. Here are some of its soft dependencies.
+ Python virtual environments install instructions at: + Python virtual environments install instructions at:
+ [[https://github.com/pyenv/pyenv][pyenv]] + [[https://github.com/pyenv/pyenv][pyenv]]
+ [[https://conda.io/en/latest/][Conda]] + [[https://conda.io/en/latest/][Conda]]
+ [[https://python-poetry.org/][Poetry]]
+ ~pipenv~ requires [[https://pipenv.readthedocs.io/en/latest/][pipenv]] + ~pipenv~ requires [[https://pipenv.readthedocs.io/en/latest/][pipenv]]

View file

@ -280,6 +280,11 @@ called.")
'append)) 'append))
(use-package! poetry
:when (featurep! +poetry)
:after python)
(use-package! lsp-python-ms (use-package! lsp-python-ms
:when (featurep! +lsp) :when (featurep! +lsp)
:after lsp-clients :after lsp-clients

View file

@ -20,6 +20,10 @@
(unless (executable-find "conda") (unless (executable-find "conda")
(warn! "Couldn't find conda in your PATH"))) (warn! "Couldn't find conda in your PATH")))
(when (featurep! +poetry)
(if (not (executable-find "poetry"))
(warn! "Couldn't find poetry in your PATH")))
(when (featurep! +cython) (when (featurep! +cython)
(unless (executable-find "cython") (unless (executable-find "cython")
(warn! "Couldn't find cython. cython-mode will not work."))) (warn! "Couldn't find cython. cython-mode will not work.")))

View file

@ -24,6 +24,8 @@
(package! pyenv-mode :pin "aec6f2aa28")) (package! pyenv-mode :pin "aec6f2aa28"))
(when (featurep! +conda) (when (featurep! +conda)
(package! conda :pin "335474e409")) (package! conda :pin "335474e409"))
(when (featurep! +poetry)
(package! poetry :pin "6dcc9d22ca"))
;; Testing frameworks ;; Testing frameworks
(package! nose :pin "f852829751") (package! nose :pin "f852829751")