diff options
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/emacs-xyz.scm | 9 | ||||
| -rw-r--r-- | gnu/packages/patches/emacs-elpy-dup-test-name.patch | 60 |
3 files changed, 4 insertions, 66 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index ef4a44470f..f341b1b1e6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1215,7 +1215,6 @@ dist_patch_DATA = \ %D%/packages/patches/elm-reactor-static-files.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-elpy-dup-test-name.patch \ %D%/packages/patches/emacs-disable-jit-compilation.patch \ %D%/packages/patches/emacs-exec-path.patch \ %D%/packages/patches/emacs-fix-scheme-indent-function.patch \ diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ca99b8502b..807d3cc624 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -31,7 +31,7 @@ ;;; Copyright © 2017 Peter Mikkelsen <petermikkelsen10@gmail.com> ;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; 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, 2019 Mathieu Lirzin <mthl@gnu.org> ;;; 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/pull/1951 ;; https://github.com/jorgenschaefer/elpy/issues/1940. - (let ((commit "7ff8ffa918411887d165764f7a5a12bc46646e73") - (revision "2")) + (let ((commit "0b381f55969438ab2ccc2d1a1614045fcf7c9545") + (revision "3")) (package (name "emacs-elpy") (version (git-version "1.35.0" revision commit)) @@ -17745,8 +17745,7 @@ indentation guides in Emacs: (file-name (git-file-name name version)) (sha256 (base32 - "0lh8w5a1abxaa7lf1c4yzgr0sh9szcwdnwd8w2004hv6mrcmyqc6")) - (patches (search-patches "emacs-elpy-dup-test-name.patch")))) + "0398zwzq5c33fi8icyy2x50q7rs819i5xkpmhbfm1s34m6prv46a")))) (build-system emacs-build-system) (arguments `(#:include (cons* "^elpy/[^/]+\\.py$" "^snippets\\/" %default-include) diff --git a/gnu/packages/patches/emacs-elpy-dup-test-name.patch b/gnu/packages/patches/emacs-elpy-dup-test-name.patch deleted file mode 100644 index 02f3f45cec..0000000000 --- a/gnu/packages/patches/emacs-elpy-dup-test-name.patch +++ /dev/null @@ -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) |