Skip to content

Commit 5e4f2e1

Browse files
committed
Merge branch 'master' into release
2 parents 69636c5 + 0de9227 commit 5e4f2e1

File tree

6 files changed

+11
-5
lines changed

6 files changed

+11
-5
lines changed

CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
## 0.17.1
4+
5+
### Bug fixes
6+
7+
* Fix missing url passing when using a custom authenticator [#684](https://github.com/jupyter-incubator/sparkmagic/pull/684). Thanks @gthomas-slack
8+
39
## 0.17.0
410

511
### Features
+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '0.17.0'
1+
__version__ = '0.17.1'
+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '0.17.0'
1+
__version__ = '0.17.1'

sparkmagic/sparkmagic/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
__version__ = '0.17.0'
1+
__version__ = '0.17.1'
22

33
from sparkmagic.serverextension.handlers import load_jupyter_server_extension
44

sparkmagic/sparkmagic/controllerwidget/magicscontrollerwidget.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def _get_default_endpoints():
3333
if all([p in endpoint_config for p in ["url", "password", "username"]]) and endpoint_config["url"] != "":
3434
user = endpoint_config["username"]
3535
passwd = endpoint_config["password"]
36-
args = Namespace(user=user, password=passwd, auth=endpoint_config.get("auth", None))
36+
args = Namespace(user=user, password=passwd, auth=endpoint_config.get("auth", None), url=endpoint_config.get("url", None))
3737
auth_instance = initialize_auth(args)
3838

3939
default_endpoints.add(Endpoint(

sparkmagic/sparkmagic/kernels/kernelmagics.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@ def matplot(self, line, cell="", local_ns=None):
429429
def refresh_configuration(self):
430430
credentials = getattr(conf, 'base64_kernel_' + self.language + '_credentials')()
431431
(username, password, auth, url) = (credentials['username'], credentials['password'], credentials['auth'], credentials['url'])
432-
args = Namespace(auth=auth, user=username, password=password)
432+
args = Namespace(auth=auth, user=username, password=password, url=url)
433433
auth_instance = initialize_auth(args)
434434
self.endpoint = Endpoint(url, auth_instance)
435435

0 commit comments

Comments
 (0)