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.35.0-0.8d0de31.

Browse source 
* gnu/packages/emacs-xyz.scm (emacs-elpy): Update to 1.35.0-0.8d0de31.
[source]: Use git-fetch.
[phases]{patch-ffip-project-search-call}: Delete.
{disable-broken-tests}: New phase.
[propagated-inputs]{python-rope}: Remove.
This commit is contained in:
Maxim Cournoyer 2021-10-31 01:18:19 -04:00
parent 18dd5e45e4
commit d42a56f8ae
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 83 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -10545,32 +10545,39 @@ indentation guides in Emacs:
(license license:gpl2+)))) (license license:gpl2+))))
(define-public emacs-elpy (define-public emacs-elpy
;; Use the latest commit, as it contains unreleased fixes for Python 3.9 and
;; Jedi 0.18.
(let ((commit "8d0de310d41ebf06b22321a8534546447456870c")
(revision "0"))
(package (package
(name "emacs-elpy") (name "emacs-elpy")
(version "1.35.0") (version (git-version "1.35.0" revision commit))
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/jorgenschaefer/elpy") (url "https://github.com/jorgenschaefer/elpy")
(commit version))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"07rdb9w3bxzfr07224awa541xdy116hyc2b3bpl3fc3ikddmbydk")))) "0hg6yk0wkfh2rwcc4h0bb6m2p3dg62ja22mjpa94khq52lv1piwf"))))
(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
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'patch-ffip-project-search-call (add-after 'unpack 'disable-broken-tests
;; Some tests are known to have problems with Python 3.9; disable
;; them (see: https://github.com/jorgenschaefer/elpy/issues/1856).
(lambda _ (lambda _
;; Since version 6.0.0 of find-file-in-project, (substitute* "test/elpy-refactor-rename-test.el"
;; ffip-project-search doesn't accept a third argument anymore ((".*ert-deftest elpy-refactor.*rename-in-multiple-files.*"
;; (see: https://github.com/jorgenschaefer/elpy/issues/1889). all)
(substitute* "elpy.el" (string-append all " :expected-result :failed\n")))
(("\\((ffip-project-search nil nil) project-root\\)" _ signature) (substitute* "test/elpy-multiedit-python-symbol-at-point-test.el"
(format #f "(let ((ffip-project-root project-root)) (~a))" ((".*ert-deftest elpy-multiedit.*should-save-some-buffers.*"
signature))))) all)
(string-append all " :expected-result :failed\n")))))
;; The default environment of the RPC uses Virtualenv to install ;; The default environment of the RPC uses Virtualenv to install
;; Python dependencies from PyPI. We don't want/need this in Guix. ;; Python dependencies from PyPI. We don't want/need this in Guix.
(add-before 'check 'do-not-use-virtualenv (add-before 'check 'do-not-use-virtualenv
@ -10609,7 +10616,6 @@ indentation guides in Emacs:
("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-rope" ,python-rope)
("python-yapf" ,python-yapf))) ("python-yapf" ,python-yapf)))
(native-inputs (native-inputs
`(("ert-runner" ,emacs-ert-runner) `(("ert-runner" ,emacs-ert-runner)
@ -10624,7 +10630,7 @@ indentation guides in Emacs:
and configures a number of other packages written in Emacs Lisp as well as and configures a number of other packages written in Emacs Lisp as well as
Python, together offering features such as navigation, documentation, Python, together offering features such as navigation, documentation,
completion, interactive development and more.") completion, interactive development and more.")
(license license:gpl3+))) (license license:gpl3+))))
(define-public emacs-rainbow-delimiters (define-public emacs-rainbow-delimiters
(package (package