From d6fa32a202bf128e9b5483cc1c35e1f6bd7e0f6e Mon Sep 17 00:00:00 2001 From: Lucien Cartier-Tilet Date: Thu, 1 Oct 2020 18:21:30 +0200 Subject: [PATCH] [Bootstrap] Remove yapf package, add pyls-black python package `pyls-black' is a new requirement for a proper LSP Python server, and it is incompatible with `yapf', hence its removal. --- .config/yadm/bootstrap | 4 ++-- org/config/installation.org | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.config/yadm/bootstrap b/.config/yadm/bootstrap index df2acba..09146d8 100755 --- a/.config/yadm/bootstrap +++ b/.config/yadm/bootstrap @@ -93,7 +93,7 @@ ttf-liberation ttf-monapo ttf-sazanami ttf-tibetan-machine typescript \ typescript-language-server-bin unicode-emoji unrar usbutils valgrind \ vscode-css-languageserver-bin vscode-html-languageserver-bin w3m wget \ x11-ssh-askpass xclip xdg-user-dirs-gtk xfsprogs xorg-drivers xorg-server \ -xorg-xinit xss-lock xvkbd yaml-language-server-bin yapf zeal +xorg-xinit xss-lock xvkbd yaml-language-server-bin zeal printf "\n# Installing needed packages ##################################################\n\n" sudo pacman -Syu @@ -235,7 +235,7 @@ rustup component add rls rustup component add clippy printf "\n# Installing Python packages ##################################################\n\n" -pip install --user pyls-isort pyls-mypy +pip install --user pyls-isort pyls-mypy pyls-black printf "\n# Setting up Chicken ##########################################################\n\n" chicken-install -s apropos chicken-doc diff --git a/org/config/installation.org b/org/config/installation.org index 83a17b7..b314063 100644 --- a/org/config/installation.org +++ b/org/config/installation.org @@ -266,7 +266,7 @@ typescript-language-server-bin unicode-emoji unrar usbutils valgrind \ vscode-css-languageserver-bin vscode-html-languageserver-bin w3m wget \ x11-ssh-askpass xclip xdg-user-dirs-gtk xfsprogs xorg-drivers xorg-server \ - xorg-xinit xss-lock xvkbd yaml-language-server-bin yapf zeal + xorg-xinit xss-lock xvkbd yaml-language-server-bin zeal #+END_SRC These are the minimum I would have in my own installation. You can edit it @@ -702,6 +702,7 @@ |------------+-------------------------| | pyls-isort | Import sortings for LSP | | pyls-mypy | Mypy linter for LSP | + | pyls-black | Black plugin for pyls | #+NAME: python-packages-gen #+BEGIN_SRC emacs-lisp :var packages=python-packages-table[,0] @@ -709,8 +710,8 @@ (s-join " " packages)) #+END_SRC - #+RESULTS[949734d540debf625c0067b0b129d630260f1cb1]: - : pip install --user pyls-isort pyls-mypy + #+RESULTS[d368dd4fa0df32b06cf27cb047ea3565777ffce6]: python-packages-gen + : pip install --user pyls-isort pyls-mypy pyls-black Let’s install them locally for our user. #+BEGIN_SRC fish :noweb yes