mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
gnu: emacs-elpy: Update to 1.35.0-3.0b381f5.
* gnu/packages/emacs-xyz.scm (emacs-elpy): Update to 1.35.0-3.0b381f5. [source]: Delete patches. * gnu/packages/patches/emacs-elpy-dup-test-name.patch: Delete file. * gnu/local.mk (dist_patch_DATA): De-register it. Change-Id: Ida97fd5ad3fa58b6315bef93fd6dc9b8d7e19118
This commit is contained in:
parent
1e0c99eaca
commit
152450668f
3 changed files with 4 additions and 66 deletions
|
@ -1215,7 +1215,6 @@ dist_patch_DATA = \
|
||||||
%D%/packages/patches/elm-reactor-static-files.patch \
|
%D%/packages/patches/elm-reactor-static-files.patch \
|
||||||
%D%/packages/patches/emacs-all-the-icons-remove-duplicate-rs.patch \
|
%D%/packages/patches/emacs-all-the-icons-remove-duplicate-rs.patch \
|
||||||
%D%/packages/patches/emacs-deferred-fix-number-of-arguments.patch \
|
%D%/packages/patches/emacs-deferred-fix-number-of-arguments.patch \
|
||||||
%D%/packages/patches/emacs-elpy-dup-test-name.patch \
|
|
||||||
%D%/packages/patches/emacs-disable-jit-compilation.patch \
|
%D%/packages/patches/emacs-disable-jit-compilation.patch \
|
||||||
%D%/packages/patches/emacs-exec-path.patch \
|
%D%/packages/patches/emacs-exec-path.patch \
|
||||||
%D%/packages/patches/emacs-fix-scheme-indent-function.patch \
|
%D%/packages/patches/emacs-fix-scheme-indent-function.patch \
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
;;; Copyright © 2017 Peter Mikkelsen <petermikkelsen10@gmail.com>
|
;;; Copyright © 2017 Peter Mikkelsen <petermikkelsen10@gmail.com>
|
||||||
;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <me@tobias.gr>
|
;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||||
;;; Copyright © 2017 Mike Gerwitz <mtg@gnu.org>
|
;;; Copyright © 2017 Mike Gerwitz <mtg@gnu.org>
|
||||||
;;; Copyright © 2017-2025 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
;;; Copyright © 2017-2025 Maxim Cournoyer <maxim@guixotic.coop>
|
||||||
;;; Copyright © 2018 Sohom Bhattacharjee <soham.bhattacharjee15@gmail.com>
|
;;; Copyright © 2018 Sohom Bhattacharjee <soham.bhattacharjee15@gmail.com>
|
||||||
;;; Copyright © 2018, 2019 Mathieu Lirzin <mthl@gnu.org>
|
;;; Copyright © 2018, 2019 Mathieu Lirzin <mthl@gnu.org>
|
||||||
;;; Copyright © 2018, 2019, 2020, 2021 Pierre Neidhardt <mail@ambrevar.xyz>
|
;;; Copyright © 2018, 2019, 2020, 2021 Pierre Neidhardt <mail@ambrevar.xyz>
|
||||||
|
@ -17732,8 +17732,8 @@ indentation guides in Emacs:
|
||||||
;; https://github.com/jorgenschaefer/elpy/issues/1824
|
;; https://github.com/jorgenschaefer/elpy/issues/1824
|
||||||
;; https://github.com/jorgenschaefer/elpy/pull/1951
|
;; https://github.com/jorgenschaefer/elpy/pull/1951
|
||||||
;; https://github.com/jorgenschaefer/elpy/issues/1940.
|
;; https://github.com/jorgenschaefer/elpy/issues/1940.
|
||||||
(let ((commit "7ff8ffa918411887d165764f7a5a12bc46646e73")
|
(let ((commit "0b381f55969438ab2ccc2d1a1614045fcf7c9545")
|
||||||
(revision "2"))
|
(revision "3"))
|
||||||
(package
|
(package
|
||||||
(name "emacs-elpy")
|
(name "emacs-elpy")
|
||||||
(version (git-version "1.35.0" revision commit))
|
(version (git-version "1.35.0" revision commit))
|
||||||
|
@ -17745,8 +17745,7 @@ indentation guides in Emacs:
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0lh8w5a1abxaa7lf1c4yzgr0sh9szcwdnwd8w2004hv6mrcmyqc6"))
|
"0398zwzq5c33fi8icyy2x50q7rs819i5xkpmhbfm1s34m6prv46a"))))
|
||||||
(patches (search-patches "emacs-elpy-dup-test-name.patch"))))
|
|
||||||
(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)
|
||||||
|
|
|
@ -1,60 +0,0 @@
|
||||||
Forwarded upstream: https://github.com/jorgenschaefer/elpy/pull/2031
|
|
||||||
|
|
||||||
diff --git a/test/elpy-config--insert-help-test.el b/test/elpy-config--insert-help-test.el
|
|
||||||
index bb293ff..2584fd4 100644
|
|
||||||
--- a/test/elpy-config--insert-help-test.el
|
|
||||||
+++ b/test/elpy-config--insert-help-test.el
|
|
||||||
@@ -2,6 +2,6 @@
|
|
||||||
;; with output. We will test its constituent functions later, and just
|
|
||||||
;; make sure it doesn't throw an error here.
|
|
||||||
|
|
||||||
-(ert-deftest elpy-config-should-not-fail ()
|
|
||||||
+(ert-deftest elpy-config-should-not-fail-insert-help ()
|
|
||||||
(elpy-testcase ()
|
|
||||||
(elpy-config--insert-help)))
|
|
||||||
diff --git a/test/elpy-library-root-test.el b/test/elpy-library-root-test.el
|
|
||||||
index fdc88b2..2f7484c 100644
|
|
||||||
--- a/test/elpy-library-root-test.el
|
|
||||||
+++ b/test/elpy-library-root-test.el
|
|
||||||
@@ -4,7 +4,7 @@
|
|
||||||
(should (f-equal? (elpy-library-root)
|
|
||||||
project-root))))
|
|
||||||
|
|
||||||
-(ert-deftest elpy-library-root-should-find-current-directory ()
|
|
||||||
+(ert-deftest elpy-library-root-should-find-current-directory-2 ()
|
|
||||||
(elpy-testcase ((:project project-root
|
|
||||||
"p1/p2/test.py"
|
|
||||||
"p1/p2/__init__.py"
|
|
||||||
diff --git a/test/elpy-open-and-indent-line-above-test.el b/test/elpy-open-and-indent-line-above-test.el
|
|
||||||
index d846712..790dd26 100644
|
|
||||||
--- a/test/elpy-open-and-indent-line-above-test.el
|
|
||||||
+++ b/test/elpy-open-and-indent-line-above-test.el
|
|
||||||
@@ -1,4 +1,4 @@
|
|
||||||
-(ert-deftest elpy-open-and-indent-line-below ()
|
|
||||||
+(ert-deftest elpy-open-and-indent-line-above ()
|
|
||||||
(elpy-testcase ()
|
|
||||||
(elpy-enable)
|
|
||||||
(python-mode)
|
|
||||||
diff --git a/test/elpy-rpc-get-usages-test.el b/test/elpy-rpc-get-usages-test.el
|
|
||||||
index 85f0ad4..be5d7c5 100644
|
|
||||||
--- a/test/elpy-rpc-get-usages-test.el
|
|
||||||
+++ b/test/elpy-rpc-get-usages-test.el
|
|
||||||
@@ -1,4 +1,4 @@
|
|
||||||
-(ert-deftest elpy-rpc-get-completions ()
|
|
||||||
+(ert-deftest elpy-rpc-get-completions-usages ()
|
|
||||||
(elpy-testcase ()
|
|
||||||
(mletf* ((called-args nil)
|
|
||||||
(elpy-rpc (&rest args) (setq called-args args)))
|
|
||||||
diff --git a/test/elpy-rpc-test.el b/test/elpy-rpc-test.el
|
|
||||||
index 8b5bdca..3ff6965 100644
|
|
||||||
--- a/test/elpy-rpc-test.el
|
|
||||||
+++ b/test/elpy-rpc-test.el
|
|
||||||
@@ -17,7 +17,7 @@
|
|
||||||
(should (equal error 'elpy-rpc--default-error-callback))))
|
|
||||||
(elpy-rpc "test-method" nil 'success))))
|
|
||||||
|
|
||||||
-(ert-deftest elpy-rpc-should-use-default-without-error-callback ()
|
|
||||||
+(ert-deftest elpy-rpc-should-use-default-without-error-callback-2 ()
|
|
||||||
(elpy-testcase ()
|
|
||||||
(mletf* ((elpy-rpc--call-blocking
|
|
||||||
(method params)
|
|
Loading…
Add table
Add a link
Reference in a new issue