From 1fa1eba5ac38d654a0763282f3ddd631e873c273 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <git@henrik.io>
Date: Thu, 5 Sep 2024 05:25:40 -0400
Subject: [PATCH] bump: :lang python

emacs-lsp/lsp-pyright@cc6df06aeaee -> emacs-lsp/lsp-pyright@0c0d72aedd18
necaris/conda.el@60e14d1e9793 -> necaris/conda.el@ce748a53f9c7
pythonic-emacs/anaconda-mode@79fa9b4d2bda -> pythonic-emacs/anaconda-mode@f900bd7656a0
pythonic-emacs/company-anaconda@1fe526163c26 -> pythonic-emacs/company-anaconda@169252fca79a
pythonic-emacs/pyenv-mode@de0d750b9c30 -> pythonic-emacs/pyenv-mode@76787ea44f63
wbolster/emacs-python-pytest@9f850e22df93 -> wbolster/emacs-python-pytest@dcdaec6fe203

- Adds basedpyright support to lsp-pyright; and will prioritize it above
  pyright, if found on your system.

Ref: emacs-lsp/lsp-pyright#101
---
 modules/lang/python/README.org  |  5 +++--
 modules/lang/python/config.el   |  5 ++++-
 modules/lang/python/packages.el | 12 ++++++------
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/modules/lang/python/README.org b/modules/lang/python/README.org
index 977365736..a0ef69f5b 100644
--- a/modules/lang/python/README.org
+++ b/modules/lang/python/README.org
@@ -10,7 +10,7 @@ This module adds [[https://www.python.org/][Python]] support to Doom Emacs.
 - Snippets
 - Run tests ([[doom-package:nose]], [[doom-package:pytest]])
 - Auto-format (with ~black~, requires [[doom-module::editor format]])
-- LSP integration (=pyls=, =jedi=, =ruff=, or =pyright=)
+- LSP integration (=pyls=, =jedi=, =ruff=, =pyright=, or =basedpyright=)
 
 ** Maintainers
 - [[doom-user:][@hlissner]]
@@ -86,9 +86,10 @@ For LSP support the [[doom-module::tools lsp]] module must be enabled, along wit
 
 An alternative LSP server can be used by installing them through the
 [[cmd:][lsp-install-server]] command, or an external package manager. For example:
+- To install *basedpyright*: ~$ pip install basedpyright~
+- To install *pyright*: ~$ pip install pyright~ or ~$ npm i -g pyright~.
 - To install [[https://pypi.org/project/python-language-server/][*pyls*]]: ~$ pip install python-language-server[all]~.
 - To install *mspyls*: ~M-x lsp-install-server RET mspyls~.
-- To install *pyright*: ~$ pip install pyright~ or ~$ npm i -g pyright~.
 
 ** Formatter
 
diff --git a/modules/lang/python/config.el b/modules/lang/python/config.el
index 3fbc0345c..7d3f57281 100644
--- a/modules/lang/python/config.el
+++ b/modules/lang/python/config.el
@@ -353,4 +353,7 @@
   :when (modulep! +lsp)
   :when (modulep! +pyright)
   :when (not (modulep! :tools lsp +eglot))
-  :after lsp-mode)
+  :after lsp-mode
+  :init
+  (when-let ((exe (executable-find "basedpyright")))
+    (setq lsp-pyright-langserver-command exe)))
diff --git a/modules/lang/python/packages.el b/modules/lang/python/packages.el
index 5fefb1d85..75928863e 100644
--- a/modules/lang/python/packages.el
+++ b/modules/lang/python/packages.el
@@ -12,26 +12,26 @@
 (when (modulep! +lsp)
   (unless (modulep! :tools lsp +eglot)
     (when (modulep! +pyright)
-      (package! lsp-pyright :pin "cc6df06aeaee3053eb800a24193483387b7b545b"))))
+      (package! lsp-pyright :pin "0c0d72aedd18b16f48379b7d2f9ecb9c068713b0"))))
 
 ;; Programming environment
-(package! anaconda-mode :pin "79fa9b4d2bda9f69857aeffb30c75276848a2810")
+(package! anaconda-mode :pin "f900bd7656a03aa24ef3295251f266736f7756eb")
 (when (modulep! :completion company)
-  (package! company-anaconda :pin "1fe526163c265891cc20d971dc58b661ad8bcf23"))
+  (package! company-anaconda :pin "169252fca79a79da41ef22f2ec0eab0cf1313966"))
 
 ;; Environment management
 (package! pipenv :pin "3af159749824c03f59176aff7f66ddd6a5785a10")
 (package! pyvenv :pin "31ea715f2164dd611e7fc77b26390ef3ca93509b")
 (when (modulep! +pyenv)
-  (package! pyenv-mode :pin "de0d750b9c3057fd7cecc72e6a290902a0475afe"))
+  (package! pyenv-mode :pin "76787ea44f633426df402341663784db3a9e9639"))
 (when (modulep! +conda)
-  (package! conda :pin "60e14d1e9793431b91913a5688e278bd91d56224"))
+  (package! conda :pin "ce748a53f9c7d7a7d112632d32c848d6e5482e18"))
 (when (modulep! +poetry)
   (package! poetry :pin "1dff0d4a51ea8aff5f6ce97b154ea799902639ad"))
 
 ;; Testing frameworks
 (package! nose :pin "f8528297519eba911696c4e68fa88892de9a7b72")
-(package! python-pytest :pin "9f850e22df93812a5b109968c549f9b3dd828ed1")
+(package! python-pytest :pin "dcdaec6fe203f08bda0f5ee1931370dfd075a4ff")
 
 ;; Import managements
 (package! pyimport :pin "4398ce8dd64fa0f685f4bf8683a35087649346d3")