Skip to content

Commit 428fab0

Browse files
committed
all: use pure-Go implementation of zmq4
Fixes #199.
1 parent 7faaaff commit 428fab0

File tree

14 files changed

+185
-896
lines changed

14 files changed

+185
-896
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ matrix:
1414
sudo: true
1515

1616
before_install:
17-
- sudo apt-get install pkg-config libzmq3-dev build-essential python3-pip
17+
- sudo apt-get install build-essential python3-pip
1818

1919
script:
2020
- go test -v ./...

README.md

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@
4242

4343
- [Go 1.11+](https://golang.org/doc/install) - including GOPATH/bin added to your PATH (i.e., you can run Go binaries that you `go install`).
4444
- [Jupyter Notebook](http://jupyter.readthedocs.io/en/latest/install.html) or [nteract](https://nteract.io/desktop)
45-
- [ZeroMQ 4.X.X](http://zeromq.org/intro:get-the-software) - for convenience, pre-built Windows binaries (v4.2.1) are included in the zmq-win directory.
46-
- [pkg-config](https://en.wikipedia.org/wiki/Pkg-config)
4745
- [git](https://git-scm.com/download) - usually already present on Linux and Mac OS X. If not present, follow the instructions at [https://git-scm.com/download](https://git-scm.com/download)
4846
On Windows, it can also be installed as part of MinGW as described below.
4947

@@ -135,26 +133,7 @@ Make sure you have the MinGW toolchain:
135133

136134
Then:
137135

138-
1. build and install gophernotes (using the pre-built binaries and `zmq-win\build.bat`):
139-
140-
```
141-
REM Download w/o building.
142-
set GO111MODULE=off
143-
go get -d -u github.com/gopherdata/gophernotes
144-
cd %GOPATH%\src\github.com\gopherdata\gophernotes\zmq-win
145-
146-
REM Build x64 version.
147-
build.bat amd64
148-
move gophernotes.exe %GOPATH%\bin
149-
copy lib-amd64\libzmq.dll %GOPATH%\bin
150-
151-
REM Build x86 version.
152-
build.bat 386
153-
move gophernotes.exe %GOPATH%\bin
154-
copy lib-386\libzmq.dll %GOPATH%\bin
155-
```
156-
157-
3. Copy the kernel config:
136+
1. Copy the kernel config:
158137

159138
```
160139
mkdir %APPDATA%\jupyter\kernels\gophernotes
@@ -167,7 +146,7 @@ Then:
167146
jupyter --data-dir
168147
```
169148
170-
4. Update `%APPDATA%\jupyter\kernels\gophernotes\kernel.json` with the FULL PATH to your gophernotes.exe (in %GOPATH%\bin), unless it's already on the PATH. For example:
149+
2. Update `%APPDATA%\jupyter\kernels\gophernotes\kernel.json` with the FULL PATH to your gophernotes.exe (in %GOPATH%\bin), unless it's already on the PATH. For example:
171150
172151
```
173152
{

go.mod

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ go 1.11
44

55
require (
66
github.com/cosmos72/gomacro v0.0.0-20200226181501-ca599f547e70
7+
github.com/go-zeromq/zmq4 v0.9.0
78
github.com/gofrs/uuid v3.2.0+incompatible
8-
github.com/pebbe/zmq4 v0.0.0-20170917105202-90d69e412a09
9+
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e // indirect
10+
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543
911
)

go.sum

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
github.com/cosmos72/gomacro v0.0.0-20200226181501-ca599f547e70 h1:WbqOfgqLIYnq/2TJRVCXXL+0sJf0F4kQ1Uqm2ZkvrHA=
22
github.com/cosmos72/gomacro v0.0.0-20200226181501-ca599f547e70/go.mod h1:Osdpin0EoLKzHqueN0M7mrcai0vkT6+WfVM4L1mK46M=
3+
github.com/go-zeromq/goczmq/v4 v4.2.2 h1:HAJN+i+3NW55ijMJJhk7oWxHKXgAuSBkoFfvr8bYj4U=
4+
github.com/go-zeromq/goczmq/v4 v4.2.2/go.mod h1:Sm/lxrfxP/Oxqs0tnHD6WAhwkWrx+S+1MRrKzcxoaYE=
5+
github.com/go-zeromq/zmq4 v0.9.0 h1:aFkxnxJvYhXCrE7UhoRR6oP6wqanjkuO2nA0nMsnm0g=
6+
github.com/go-zeromq/zmq4 v0.9.0/go.mod h1:hCJ0OxYnL3Y3erSLQ025VLGi/W63zJjvr9i17oU2P24=
37
github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4+jfEaewE=
48
github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
59
github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
610
github.com/mattn/go-runewidth v0.0.8 h1:3tS41NlGYSmhhe/8fhGRzc+z3AYCw1Fe1WAyLuujKs0=
711
github.com/mattn/go-runewidth v0.0.8/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
8-
github.com/pebbe/zmq4 v0.0.0-20170917105202-90d69e412a09 h1:D+wn+7HlHn4LavkM6OmjnVea5BKr7SkGocQQ2jsu4Go=
9-
github.com/pebbe/zmq4 v0.0.0-20170917105202-90d69e412a09/go.mod h1:7N4y5R18zBiu3l0vajMUWQgZyjv464prE8RCyBcmnZM=
1012
github.com/peterh/liner v1.2.0 h1:w/UPXyl5GfahFxcTOz2j9wCIHNI+pUPr2laqpojKNCg=
1113
github.com/peterh/liner v1.2.0/go.mod h1:CRroGNssyjTd/qIG2FyxByd2S8JEAZXBl4qUrZf8GS0=
1214
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
@@ -16,10 +18,14 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB
1618
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
1719
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
1820
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
21+
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY=
22+
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
1923
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
2024
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
2125
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
2226
golang.org/x/tools v0.0.0-20200226171234-020676185e75 h1:95pMZrmH6IfFXj0QqqZEpHTQrda/ABLE2nOzgHlJ3GA=
2327
golang.org/x/tools v0.0.0-20200226171234-020676185e75/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
24-
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898 h1:/atklqdjdhuosWIl6AIbOeHJjicWYPqR9bpxqxYG2pA=
28+
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
2529
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
30+
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
31+
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

0 commit comments

Comments
 (0)