Commit graph

2595 commits

Author SHA1 Message Date
dickmao
2aa5d004b4 fix a spoonerism 2018-10-26 12:20:07 -04:00
John Miller
ab8f881bff ein-notebooklist: Fix check for multiple servers on same port.
If `notebook list` returns more than one entry for the same url:port the
resulting structure won't be a list of lists, but rather a list of multiple
paired elements.
2018-10-23 09:02:17 -05:00
dickmao
e693a53e5a master fixes
ein:url normalization issue (fails the passworded server test).
"No servers running here" warning is unsettling for I think the
majority of users who do not run jupyter locally.
2018-10-23 02:12:45 -04:00
John Miller
309e21c119 Merge branch 'master' of ssh://github.com/millejoh/emacs-ipython-notebook 2018-10-22 18:15:05 -05:00
John Miller
21dca7b2f9 Merge branch 'login-staging' 2018-10-22 14:54:20 -05:00
John Miller
6944fb0a3f ein-notebooklist: Fix format string.
Format string was missing a parameter. Also some doc string cleanup.
2018-10-22 14:52:46 -05:00
John Miller
a26ca7fa7d ein-notebooklist: Fix corner case in token autodetection.
There appears to be a (hopefully very rare) possibility of `jupyter notebook
list --json` returning multiple tokens for the same url. This will result in
some perplexing behavior in ein, so these changes try to bring clarity when such
a situation occurs.
2018-10-22 14:49:45 -05:00
John Miller
35f06babc6 ein-worksheet: Fix whitespace, argument list for error call.
Missing an argument for the error format string. Also cleaned up some lingering
whitespace.
2018-10-22 14:45:14 -05:00
John Miller
a14b053f29
Merge pull request #359 from dickmao/ob-testing-stub
Issue #355 - remove an endless loop
2018-10-21 16:11:05 -05:00
dickmao
3ba5548208 Issue #355 - remove an endless loop
Remove a waiting for godot loop in `ob-ein`.
Add a test stub for ob-ein.
2018-10-21 14:44:11 -04:00
dickmao
16cb32a1a6 more request-curl callback protections 2018-10-20 21:37:47 -04:00
dickmao
7a6d3c072b appveyor for msys2 2018-10-20 20:19:58 -04:00
dickmao
0345ed0b33 Try to address windows NT unseen. Add osx. Add ipython 7.0.1. 2018-10-20 00:12:34 -04:00
John Miller
ad978aad11 ob-ein: Save source block contents before executing.
Fixes #358.
2018-10-19 13:41:13 -05:00
dickmao
461b268eea retry kernelspecs 403 2018-10-18 19:05:17 -04:00
dickmao
c89a0a8887 it a'int easy being green. 2018-10-18 16:23:49 -04:00
John Miller
3fd5fd06ee ein-websocket: Don't dump entire websocket structure during error.
Dumping the whole structure to the log does more to obscure than help, so I have
shortened the amount of information shared.
2018-10-17 20:59:58 -05:00
dickmao
6e3a062e98 travis is a harsh taskmaster 2018-10-17 17:45:19 -04:00
dickmao
c5bfb0dca1 expose ein:notebooklist-open as a bonafide function (but obsolete) 2018-10-17 17:24:34 -04:00
dickmao
085a188b20 Streamline login
Merge the login and open commands (open aliased to login).  Add login
tests described in #352.

Attempt to improve user experience by synchronously executing
`ein:jupyter-server-start`.  `ein:dev-prefer-deferred` custom variable
allows easy switch to compare sychronous versus old asynchronous behavior.
2018-10-17 16:52:10 -04:00
John Miller
81ea6b25fa ob-ein.el: Fix for starting sessions from an org buffer.
John has now achieved zen understanding of the difference between `funcall' and
`apply'.
2018-10-16 16:05:06 -05:00
John Miller
2a1c7d4a85 Merge branch 'issue-350' 2018-10-15 16:38:27 -05:00
dickmao
3ba6622005 Revert "Normalize url-or-port"
This reverts commit 435d001b03.
2018-10-15 16:23:10 -05:00
John Miller
622f033abd
Merge pull request #354 from dickmao/fix-master
Revert extra commit
2018-10-15 14:17:29 -05:00
dickmao
257331f32c Revert "Normalize url-or-port"
This reverts commit 435d001b03.
2018-10-15 14:13:51 -04:00
dickmao
9c1271b8d9
Merge branch 'master' into issue-350 2018-10-15 12:32:28 -04:00
John Miller
2c2e1940d0 Merge branch 'master' of ssh://github.com/millejoh/emacs-ipython-notebook 2018-10-15 11:19:44 -05:00
dickmao
512658883b @sam-s says Requiring ESS is wrong because it forces people who do NOT use it to install it.
The standard way to avoid this problem is to use autoload instead of require.
This way ESS is not required to compile and run EIN and it is only loaded if the user actually uses it.
2018-10-15 12:19:30 -04:00
John Miller
d40e8b6d32 Quick fix for #350
There may be a better way to do this, but for now at least ein will load even if
the user does not have ess installed.
2018-10-15 11:13:37 -05:00
John Miller
032c6f4d8c ob-ein: Make session url's consistent.
Ensure canonical representation defined in `ein:url' is being used for session
identifiers. Not doing this was confusing ob-ein on what kernelspec to use.
2018-10-15 11:04:55 -05:00
John Miller
fd91a6f3e1
Merge pull request #352 from dickmao/bug-issue-351
Fixes #351
2018-10-15 09:41:53 -05:00
John Miller
ad86e606ca
Merge pull request #349 from xor-xor/bugfix/pytools-export-buffer
Fix ein:pytools-export-buffer
2018-10-15 09:31:12 -05:00
dickmao
cea40017fa fix bug 2018-10-15 10:29:11 -04:00
John Miller
623920ffe6 Files from JupyterCon. 2018-10-14 22:29:53 -05:00
John Miller
285d5795c1 Merge branch 'async-staging' 2018-10-14 20:47:34 -05:00
John Miller
6610a92b34 Shortcut to run integration and functional testing without compile check. 2018-10-14 20:36:49 -05:00
dickmao
435d001b03 Normalize url-or-port
```
"http://localhost:8888"
"http://localhost:8888/"
"http://127.0.0.1:8888"
"http://127.0.0.1:8888/"
"8888"
8888
```

Ideally these should converge to the same thing.  Since many hash
tables are keyed off `url-or-port`, forgetting to
normalize `url-or-port` with `ein:url` leads to missed cache hits and
general malaise.  So we try to do that.

Address a FIXME: apply callbacks to `ein:notebook-list-login-and-open`.

Removed py3.5 from travis build matrix to reduce developer strain.
2018-10-14 20:36:49 -05:00
dickmao
c888508751 ein-jupyter must require ein-notebooklist but not conversely 2018-10-14 21:24:50 -04:00
Tomasz Mieszkowski
80cf9808a9 Fix ein:pytools-export-buffer 2018-10-13 19:59:41 +02:00
dickmao
0ae0a2f4d4 workaround for emacs-26.1 travis
Delete the org-plus-contrib dependency in Cask via a fast switcheroo
in install-cask.sh
2018-10-13 13:09:53 -04:00
dickmao
d796a830d9 emacs-26.1-travis cannot see julia-mode
For whatever reason, emacs-26.1-travis consistently fails to download an ess
dependency.
`Dependency ess failed to install:
https://melpa.org/packages/julia-mode-20180816.2117.el: Bad Request`
Remove emacs-26.1 from the build matrix until I figure this out.
2018-10-13 13:09:53 -04:00
dickmao
0c6e37c8e0 Normalize url-or-port
```
"http://localhost:8888"
"http://localhost:8888/"
"http://127.0.0.1:8888"
"http://127.0.0.1:8888/"
"8888"
8888
```

Ideally these should converge to the same thing.  Since many hash
tables are keyed off `url-or-port`, forgetting to
normalize `url-or-port` with `ein:url` leads to missed cache hits and
general malaise.  So we try to do that.

Address a FIXME: apply callbacks to `ein:notebook-list-login-and-open`.

Removed py3.5 from travis build matrix to reduce developer strain.
2018-10-13 13:09:53 -04:00
dickmao
c106ea19a5 master should pass the test again 2018-10-13 13:09:17 -04:00
John Miller
c40f41bd6f Shortcut to run integration and functional testing without compile check. 2018-10-13 07:17:44 -05:00
dickmao
c424f2ae5a workaround for emacs-26.1 travis
Delete the org-plus-contrib dependency in Cask via a fast switcheroo
in install-cask.sh
2018-10-12 21:55:33 -05:00
dickmao
24896798dd emacs-26.1-travis cannot see julia-mode
For whatever reason, emacs-26.1-travis consistently fails to download an ess
dependency.
`Dependency ess failed to install:
https://melpa.org/packages/julia-mode-20180816.2117.el: Bad Request`
Remove emacs-26.1 from the build matrix until I figure this out.
2018-10-12 21:55:33 -05:00
dickmao
bc10cea743 Normalize url-or-port
```
"http://localhost:8888"
"http://localhost:8888/"
"http://127.0.0.1:8888"
"http://127.0.0.1:8888/"
"8888"
8888
```

Ideally these should converge to the same thing.  Since many hash
tables are keyed off `url-or-port`, forgetting to
normalize `url-or-port` with `ein:url` leads to missed cache hits and
general malaise.  So we try to do that.

Address a FIXME: apply callbacks to `ein:notebook-list-login-and-open`.

Removed py3.5 from travis build matrix to reduce developer strain.
2018-10-12 21:55:33 -05:00
John Miller
af405dddb7 ein-notebooklist: Document ein:populate-hierarchy-on-notebooklist-open. 2018-10-12 20:51:32 -05:00
John Miller
c51134fa65 ein-notebooklist: Make hierarchy query optional.
Via the `ein:populate-hierarchy-on-notebooklist-open' variable, which we need to
document stat.
2018-10-12 15:32:51 -05:00
John Miller
7bc6e88e5c ein-query: More debug messages, try harder not to get stuck.
Logging to see what the heck is going on, and something of a failsafe to
continue execution in the case things get really stuck.
2018-10-12 15:31:33 -05:00