From 2ee94714cbff4c9a4a68b1148c95bf840d21b8f3 Mon Sep 17 00:00:00 2001
From: Nathaniel Nicandro <nathanielnicandro@gmail.com>
Date: Thu, 10 Sep 2020 14:51:02 -0500
Subject: [PATCH] Remove zmq dependency

---
 Makefile             | 16 ++--------------
 jupyter.el           |  5 +++--
 test/jupyter-test.el |  1 -
 3 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/Makefile b/Makefile
index 34deb6f..6882052 100644
--- a/Makefile
+++ b/Makefile
@@ -22,25 +22,13 @@ 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))"
-endif
-
 .PHONY: dev
 dev: cask
 	$(CASK) install
 	$(CASK) update
 
 .PHONY: test
-test: zmq
+test:
 	$(CASK) exec ert-runner --script $(TAGS) $(PATTERN)
 
 .PHONY: clean
@@ -57,5 +45,5 @@ widgets:
 	make -C js
 
 .PHONY: compile
-compile: zmq
+compile:
 	$(CASK) build
diff --git a/jupyter.el b/jupyter.el
index 79b97bc..5562d1b 100644
--- a/jupyter.el
+++ b/jupyter.el
@@ -5,8 +5,8 @@
 ;; Author: Nathaniel Nicandro <nathanielnicandro@gmail.com>
 ;; Created: 11 Jan 2018
 ;; Version: 0.8.2
-;; Package-Requires: ((emacs "26") (zmq "0.10.3") (cl-lib "0.5") (simple-httpd "1.5.0") (websocket "1.9"))
-;; URL: https://github.com/dzop/emacs-jupyter
+;; Package-Requires: ((emacs "26") (cl-lib "0.5") (simple-httpd "1.5.0") (websocket "1.9"))
+;; URL: https://github.com/nnicandro/emacs-jupyter
 
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License as
@@ -36,6 +36,7 @@
 (require 'jupyter-base)
 (require 'jupyter-client)
 (require 'jupyter-kernelspec)
+(require 'jupyter-server)
 (require 'jupyter-repl)
 
 (provide 'jupyter)
diff --git a/test/jupyter-test.el b/test/jupyter-test.el
index 7c1ebad..0172eeb 100644
--- a/test/jupyter-test.el
+++ b/test/jupyter-test.el
@@ -26,7 +26,6 @@
 
 ;;; Code:
 
-(require 'zmq)
 (require 'jupyter-env)
 (require 'jupyter-client)
 (require 'jupyter-repl)