Merge branch 'next'

Author: nnicandro

Diff for: .github/workflows/test.yml

@@ -0,0 +1,45 @@
+on: push
+jobs:
+  test:
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        emacs-version: [26.3, 27.2, 28.2, snapshot]
+    defaults:
+      run:
+        shell: bash -el {0}
+    runs-on: ${{ matrix.os }}
+    continue-on-error: true
+    steps:
+      - uses: actions/checkout@v3
+      - uses: purcell/setup-emacs@master
+        with:
+          version: ${{ matrix.emacs-version }}
+        if: ${{ matrix.os != 'windows-latest' }}
+      - uses: jcs090218/setup-emacs-windows@master
+        with:
+          version: ${{ matrix.emacs-version }}
+        if: ${{ matrix.os == 'windows-latest' }}
+      - uses: conda-incubator/setup-miniconda@v2
+        with:
+          python-version: 3.9
+      - name: Install requirements
+        run: |
+          conda install -c conda-forge pandoc
+          conda install -c anaconda jupyter
+          curl -fsSL https://raw.github.com/doublep/eldev/master/webinstall/eldev | sh
+
+          # Make eldev available to all future actions
+          echo "$HOME/.local/bin" >> $GITHUB_PATH
+      - name: Check Jupyter version
+        run: |
+          mkdir -p $(jupyter --runtime-dir)
+          jupyter --paths
+          jupyter --version
+          jupyter kernelspec list
+      - name: Byte compilation
+        run: |
+          make compile
+      - name: Run tests
+        run: |
+          make test

Diff for: .gitignore

@@ -5,3 +5,5 @@ node_modules/
 *lock*
 built/
 .cask/
+.eldev/
+Eldev-local

Diff for: Cask

@@ -0,0 +1,6 @@
+; -*- mode: emacs-lisp; lexical-binding: t -*-
+
+(eldev-require-version "1.2")
+(eldev-use-package-archive 'melpa)
+(eldev-add-extra-dependencies 'test 'org)
+(setq eldev-standard-excludes `(:or ,eldev-standard-excludes "./js"))

Diff for: Eldev

@@ -1,61 +1,50 @@
 EMACS ?= emacs
-SHELL = bash
-CASK ?= $(shell command -v cask)
+ELDEV ?= $(shell command -v eldev)
 
 FILES = $(wildcard *.el)
 ELCFILES = $(FILES:.el=.elc)
+TESTFILES = $(foreach file,$(wildcard test/*.el),-l $(file))
+TESTSELECTORS =
 
 ifneq ($(TAGS),)
-override TAGS := -t $(TAGS)
+comma := ,
+TESTSELECTORS := $(foreach tag,$(subst $(comma), ,$(TAGS)),\"(tag $(tag))\")
 endif
 
 ifneq ($(PATTERN),)
-override PATTERN := -p $(PATTERN)
+TESTSELECTORS := $(TESTSELECTORS) \"$(PATTERN)\"
 endif
 
+# ifneq ($(TESTSELECTORS),)
+# TESTSELECTORS := (quote (or $(TESTSELECTORS)))
+# endif
+
 .PHONY: all
 all: compile
 
-.PHONY: cask
-cask:
-ifeq ($(CASK),)
-	$(error "Install cask (https://github.com/cask/cask)")
-endif
-
-# Build the zmq module.
-.PHONY: zmq
-ifneq ($(APPVEYOR),)
-# There are issues with string quoting in Appveyor which causes the normal
-# evaluated command to give a parsing error so we just make this a no-op in
-# Appveyor. The pre-built binaries are used when building in Appveyor anyways.
-zmq:
-else
-zmq: cask
-	$(CASK) emacs -Q -batch --eval "(progn (fset 'read-string (lambda (&rest _) \"y\")) (require 'zmq))"
+.PHONY: eldev
+eldev:
+ifeq ($(ELDEV),)
+	$(error "Install eldev (https://github.com/doublep/eldev)")
 endif
 
-.PHONY: dev
-dev: cask
-	$(CASK) install
-	$(CASK) update
-
 .PHONY: test
-test: zmq
-	$(CASK) exec ert-runner --script $(TAGS) $(PATTERN)
+test:
+	$(ELDEV) test $(TESTSELECTORS)
 
 .PHONY: clean
 clean:
 	make -C js clean
 	@rm $(ELCFILES) 2>/dev/null || true
 
-.PHONY: clean-cask
-clean-cask:
-	@rm -rf .cask/ 2>/dev/null || true
+.PHONY: clean-eldev
+clean-eldev:
+	@rm -rf .eldev/ 2>/dev/null || true
 
 .PHONY: widgets
 widgets:
 	make -C js
 
 .PHONY: compile
-compile: zmq
-	$(CASK) build
+compile:
+	$(ELDEV) compile

Diff for: Makefile

@@ -527,24 +527,20 @@ the =:kernel= header argument must match the name of the kernel's kernelspec.
 To connect to a kernel behind an =HTTPS= connection, use a TRAMP file name that
 looks like =/jpys:...= instead.
 
-*** TODO Standard output, displayed data, and code block results
-
-One significant difference between Jupyter code blocks and regular =org-mode=
-code blocks is that the underlying Jupyter kernel can request that the client
-display extra data in addition to output or the result of a code block. See
-[[https://jupyter-client.readthedocs.io/en/stable/messaging.html#display-data][display_data messages]].
-
-To account for this, Jupyter code blocks do not go through the normal
-=org-mode= result insertion mechanism (see =org-babel-insert-result=). The
-downside of this is that, compared to normal code blocks, only a small subset
-of the header arguments common to all code blocks are supported. The upside is
-that all forms of results produced by a kernel can be inserted into the buffer
-similar to a Jupyter notebook.
-
-The implementation of =org-mode= code blocks is really meant to handle either
-capturing the standard output /or/ the result of a code block. When using
-Jupyter code blocks, if the kernel produces output or asks to display extra
-information, the results are appended to a =:RESULTS:= drawer.
+*** Standard output, displayed data, and code block results
+
+In contrast to non-Jupyter code blocks, the kernel of Jupyter code
+block can request extra data, other than stdout or a code block's
+result, be displayed (see [[https://jupyter-client.readthedocs.io/en/stable/messaging.html#display-data][display_data messages]]).
+
+To account for this, Jupyter code blocks do not go through the
+normal =org-mode= result insertion mechanism
+(see =org-babel-insert-result=), instead providing its own result
+insertion.  The downside is that, compared to normal =org-mode= code
+blocks, only a small subset of the header arguments are supported.
+The upside is that all forms of results produced by a kernel can be
+inserted into the buffer similar to a Jupyter notebook.
+
 *** =jupyter-org-interaction-mode=
 
 A minor mode that enables completion and custom keybindings when =point= is