branch: elpa/racket-mode commit 1f26222b0e200e2c858a33b39be5f0daac4fd7ed Author: Greg Hendershott <g...@greghendershott.com> Commit: Greg Hendershott <g...@greghendershott.com>
Bump minimum supported version of Racket to 7.8 Motivation: Ability to use stacktrace/filter/errortrace-annotate@ --- .github/workflows/test.yml | 2 +- README.org | 2 +- racket-mode.el | 2 +- racket/main.rkt | 2 +- test/racket-tests.el | 32 -------------------------------- 5 files changed, 4 insertions(+), 36 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2264086b30..544ec17a02 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,7 +17,7 @@ jobs: - '26.3' - '30.1' # most recent release racket_version: - - '6.12' # our minimum supported version + - '7.8' # our minimum supported version - 'stable' # most recent release # Also include bleeding edge snapshots of both Emacs and # Racket. Note that "allow_failure: true" doesn't seem to diff --git a/README.org b/README.org index bc75f251ae..c162dd9d0e 100644 --- a/README.org +++ b/README.org @@ -9,7 +9,7 @@ A variety of Emacs major and minor modes for [[https://www.racket-lang.org/][Rac check-syntax, debug, profile, logging, and more. The edit/run experience is similar to [[https://docs.racket-lang.org/drracket/][DrRacket]]. -Compatible with *Emacs 25.1+* and *Racket 6.12+*. +Compatible with *Emacs 25.1+* and *Racket 7.8+*. ** Documentation diff --git a/racket-mode.el b/racket-mode.el index 250da6c726..f5b2472038 100644 --- a/racket-mode.el +++ b/racket-mode.el @@ -17,7 +17,7 @@ ;; - Focus on Racket lang. ;; - Follow DrRacket concepts where applicable. ;; - Thorough font-lock and indent. -;; - Compatible with Emacs 25.1+ and Racket 6.12+. +;; - Compatible with Emacs 25.1+ and Racket 7.8+. ;; ;; Details: https://github.com/greghendershott/racket-mode diff --git a/racket/main.rkt b/racket/main.rkt index fdd4e34456..ef0b7dd29b 100644 --- a/racket/main.rkt +++ b/racket/main.rkt @@ -63,7 +63,7 @@ (module+ main (assert-racket-version (if (macos-sequoia-or-newer?) "8.14.0.4" ;issue #722 - "6.12")) ;general requirement + "7.8")) ;general requirement ;; Command-line flags (from Emacs front end invoking us) (match (current-command-line-arguments) diff --git a/test/racket-tests.el b/test/racket-tests.el index d5bc1fe247..46aaeb517b 100644 --- a/test/racket-tests.el +++ b/test/racket-tests.el @@ -392,35 +392,6 @@ c.rkt. Visit each file, racket-run, and check as expected." ;;; For both "shallow" and "deep" macro stepper tests -(defun racket-tests/racket-7.6-p () - "Is `racket-program' \"7.6\" or \"7.6 [cs]\"?" - (string-match-p - (rx bos "Welcome to Racket v7.6" (? " [cs]") ".") - (with-temp-buffer - (call-process racket-program nil t nil "--version") - (buffer-substring-no-properties (point-min) (point-max))))) - -(defun racket-tests/expected-result-for-expand-file-p (result) - "Test expected to fail because macro-debugger broken in Racket 7.6. -For use with :expected-result '(satisfies PRED). This matters -because ert-deftest is a macro evaluated at compile time, and we -want to use the value of `racket-program' at run time." - (if (racket-tests/racket-7.6-p) - (ert-test-failed-p result) - (ert-test-passed-p result))) - -(defun racket-tests/racket-8.10-or-newer-p () - (zerop - (call-process - racket-program nil nil nil - "-e" "(require version/utils) (unless (version<=? \"8.10\" (version)) (exit 255))"))) - -(defun racket-tests/expected-result-for-expand-expression-p (result) - "Test expected to fail because expansion differs in older Racket." - (if (racket-tests/racket-8.10-or-newer-p) - (ert-test-passed-p result) - (ert-test-failed-p result))) - ;;; Macro stepper: File "shallow" (defconst racket-tests/expand-mod-name "foo") @@ -444,7 +415,6 @@ want to use the value of `racket-program' at run time." ") (ert-deftest racket-tests/expand-file-shallow () - :expected-result '(satisfies racket-tests/expected-result-for-expand-file-p) (message "racket-tests/expand-file-shallow") (racket-tests/with-back-end-settings (let* ((dir (make-temp-file "test" t)) @@ -541,7 +511,6 @@ want to use the value of `racket-program' at run time." (unless (eq system-type 'windows-nt) ;requires `diff` program (ert-deftest racket-tests/expand-file-deep () - :expected-result '(satisfies racket-tests/expected-result-for-expand-file-p) (message "racket-tests/expand-file-deep") (racket-tests/with-back-end-settings (let* ((dir (make-temp-file "test" t)) @@ -641,7 +610,6 @@ want to use the value of `racket-program' at run time." (unless (eq system-type 'windows-nt) ;requires `diff` program (ert-deftest racket-tests/expand-expression () - :expected-result '(satisfies racket-tests/expected-result-for-expand-expression-p) (message "racket-tests/expand-expression") (racket-tests/with-back-end-settings (let* ((path (make-temp-file "test" nil ".rkt"))