lang/org: add +jupyter feature, deprecate +ipython

And disable +pandoc by default

Relevant to #2198
This commit is contained in:
Henrik Lissner 2019-12-16 19:23:08 -05:00
parent 11acc30400
commit e782ef1d97
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
4 changed files with 23 additions and 5 deletions

View file

@ -131,8 +131,8 @@
(org ; organize your plain life in plain text (org ; organize your plain life in plain text
+dragndrop ; drag & drop files/images into org buffers +dragndrop ; drag & drop files/images into org buffers
;;+hugo ; use Emacs for hugo blogging ;;+hugo ; use Emacs for hugo blogging
+ipython ; ipython/jupyter support for babel ;;+jupyter ; ipython/jupyter support for babel
+pandoc ; export-with-pandoc support ;;+pandoc ; export-with-pandoc support
;;+pomodoro ; be fruitful with the tomato technique ;;+pomodoro ; be fruitful with the tomato technique
+present) ; using org-mode for presentations +present) ; using org-mode for presentations
;;perl ; write code no one else can comprehend ;;perl ; write code no one else can comprehend

View file

@ -35,8 +35,8 @@ intuitive out of the box:
org files to reveal.js slideshows. org files to reveal.js slideshows.
+ Drag-and-drop support for images (with inline preview) and media files (drops + Drag-and-drop support for images (with inline preview) and media files (drops
a file icon and a short link) (requires =+dragndrop= flag). a file icon and a short link) (requires =+dragndrop= flag).
+ Integration with pandoc, ipython, reveal.js, beamer, and others (requires + Integration with pandoc, ipython, jupyter, reveal.js, beamer, and others
flags). (requires flags).
+ Export-to-clipboard functionality, for copying text into formatted html, + Export-to-clipboard functionality, for copying text into formatted html,
markdown or rich text to the clipboard (see ~+org/export-to-clipboard~ and markdown or rich text to the clipboard (see ~+org/export-to-clipboard~ and
~+org/export-to-clipboard-as-rich-text~). ~+org/export-to-clipboard-as-rich-text~).
@ -57,7 +57,8 @@ https://www.mfoot.com/blog/2015/11/22/literate-emacs-configuration-with-org-mode
+ =+gnuplot= Installs gnuplot & gnuplot-mode, which enables rendering images + =+gnuplot= Installs gnuplot & gnuplot-mode, which enables rendering images
from gnuplot src blocks or plotting tables with ~org-plot/gnuplot~ (bound to from gnuplot src blocks or plotting tables with ~org-plot/gnuplot~ (bound to
=SPC m b p=, by default). =SPC m b p=, by default).
+ =+ipython= Enables ipython+babel integration. + =+ipython= (**DEPRECATED**) Enables ipython integration for babel.
+ =+jupyter= Enables Jupyter integration for babel.
+ =+pandoc= Enables pandoc integration into the Org exporter. + =+pandoc= Enables pandoc integration into the Org exporter.
+ =+pomodoro= Enables a pomodoro timer for clocking time on tasks. + =+pomodoro= Enables a pomodoro timer for clocking time on tasks.
+ =+present= Enables integration with reveal.js, beamer and org-tree-slide, so + =+present= Enables integration with reveal.js, beamer and org-tree-slide, so
@ -96,6 +97,8 @@ https://www.mfoot.com/blog/2015/11/22/literate-emacs-configuration-with-org-mode
+ [[https://github.com/bruceravel/gnuplot-mode][gnuplot-mode]] + [[https://github.com/bruceravel/gnuplot-mode][gnuplot-mode]]
+ =+ipython= + =+ipython=
+ [[https://github.com/gregsexton/ob-ipython][ob-ipython]] + [[https://github.com/gregsexton/ob-ipython][ob-ipython]]
+ =+jupyter=
+ [[https://github.com/dzop/emacs-jupyter][jupyter]]
+ =+pandoc= + =+pandoc=
+ [[https://github.com/kawabata/ox-pandoc][ox-pandoc]] + [[https://github.com/kawabata/ox-pandoc][ox-pandoc]]
+ =+pomodoro= + =+pomodoro=

View file

@ -0,0 +1,13 @@
;;; lang/org/contrib/jupyter.el -*- lexical-binding: t; -*-
;;;###if (featurep! +jupyter)
(use-package! ob-jupyter
:defer t
:init
(after! ob-async
(pushnew! ob-async-no-async-languages-alist "jupyter-python" "jupyter-julia"))
(add-hook! '+org-babel-load-functions
(defun +org-babel-load-jupyter-h (lang)
(and (string-prefix-p "jupyter-" (symbol-name lang))
(require 'ob-jupyter nil t)))))

View file

@ -46,6 +46,8 @@
(package! gnuplot-mode)) (package! gnuplot-mode))
(when (featurep! +ipython) (when (featurep! +ipython)
(package! ob-ipython)) (package! ob-ipython))
(when (featurep! +jupyter)
(package! jupyter))
(when (featurep! +pomodoro) (when (featurep! +pomodoro)
(package! org-pomodoro)) (package! org-pomodoro))
(when (featurep! +present) (when (featurep! +present)