amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: emacs-elpy: Update to 1.32.0.

Browse source 
* gnu/packages/emacs-xyz.scm (emacs-elpy): Update to 1.32.0.
[phases]{fake-virtualenv}: Rename to 'do-not-use-virtualenv.  Use the new
ELPY_TEST_DONT_USE_VIRTUALENV environment variable to skip tests using
virtualenv, and set the elpy-rpc-virtualenv-path default value to 'system so
that a virtualenv is not needed.
[native-inputs]: Move the Python dependencies to...
[propagated] ...here.  This is so that Elpy doesn't nag users with fetching
those from PyPI.   Add python-rope.

Fixes <https://bugs.gnu.org/40079>.
Reported-by: sirgazil <sirgazil@zoho.com>
This commit is contained in:
Maxim Cournoyer 2020-03-22 07:23:15 -04:00
parent 4cbd60698d
commit 4ef89d884d
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 19 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

34
gnu/packages/emacs-xyz.scm
View file

@ -6690,7 +6690,7 @@ indentation guides in Emacs:
(define-public emacs-elpy (define-public emacs-elpy
(package (package
(name "emacs-elpy") (name "emacs-elpy")
(version "1.31.0") (version "1.32.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -6699,20 +6699,20 @@ indentation guides in Emacs:
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0bvmgqs3c80bhs9v5ymgadv7vk4iamha10y7rl09pixmjm4mzagk")))) "0f00mdnzx6xqwni86rgvaa6sfkwyh62xfbwz8qsar15j0j6vc2dj"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(arguments (arguments
`(#:include (cons* "^elpy/[^/]+\\.py$" "^snippets\\/" %default-include) `(#:include (cons* "^elpy/[^/]+\\.py$" "^snippets\\/" %default-include)
#:phases #:phases
;; TODO: Make `elpy-config' display Guix commands :)
(modify-phases %standard-phases (modify-phases %standard-phases
;; One elpy test depends on being run inside a Python virtual ;; The default environment of the RPC uses Virtualenv to install
;; environment to pass. We have nothing to gain from doing so here, ;; Python dependencies from PyPI. We don't want/need this in Guix.
;; so we just trick Elpy into thinking we are (see: (add-before 'check 'do-not-use-virtualenv
;; https://github.com/jorgenschaefer/elpy/pull/1293).
(add-before 'check 'fake-virtualenv
(lambda _ (lambda _
(setenv "VIRTUAL_ENV" "/tmp") (setenv "ELPY_TEST_DONT_USE_VIRTUALENV" "1")
(substitute* "elpy-rpc.el"
(("defcustom elpy-rpc-virtualenv-path 'default")
"defcustom elpy-rpc-virtualenv-path 'system"))
#t)) #t))
(add-before 'check 'build-doc (add-before 'check 'build-doc
(lambda _ (lambda _
@ -6738,16 +6738,20 @@ indentation guides in Emacs:
("emacs-highlight-indentation" ,emacs-highlight-indentation) ("emacs-highlight-indentation" ,emacs-highlight-indentation)
("emacs-yasnippet" ,emacs-yasnippet) ("emacs-yasnippet" ,emacs-yasnippet)
("pyvenv" ,emacs-pyvenv) ("pyvenv" ,emacs-pyvenv)
("s" ,emacs-s))) ("s" ,emacs-s)
(native-inputs ;; The following are recommended Python dependencies that make Elpy
`(("ert-runner" ,emacs-ert-runner) ;; much more useful. Installing these avoids Elpy prompting to install them
("emacs-f" ,emacs-f) ;; from PyPI using pip.
("python" ,python-wrapper)
("python-autopep8" ,python-autopep8) ("python-autopep8" ,python-autopep8)
("python-black" ,python-black) ("python-black" ,python-black)
("python-flake8" ,python-flake8) ("python-flake8" ,python-flake8)
("python-jedi" ,python-jedi) ("python-jedi" ,python-jedi)
("python-yapf" ,python-yapf) ("python-rope" ,python-rope)
("python-yapf" ,python-yapf)))
(native-inputs
`(("ert-runner" ,emacs-ert-runner)
("emacs-f" ,emacs-f)
("python" ,python-wrapper)
;; For documentation. ;; For documentation.
("python-sphinx" ,python-sphinx) ("python-sphinx" ,python-sphinx)
("texinfo" ,texinfo))) ("texinfo" ,texinfo)))