Skip to content

Commit 5a42ec0

Browse files
authored
Merge pull request #667 from jupyter-incubator/0.16.0
Prepare for 0.16.0 release.
2 parents 814dc52 + 246dcb7 commit 5a42ec0

File tree

6 files changed

+10
-4
lines changed

6 files changed

+10
-4
lines changed

CHANGELOG.md

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

3+
## 0.16.0
4+
35
### Bug fixes
46

57
* Fix ContextualVersionConflict in Dockerfile.spark. Thanks Linan Zheng, @LinanZheng
+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '0.15.0'
1+
__version__ = '0.16.0'
+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '0.15.0'
1+
__version__ = '0.16.0'

hdijupyterutils/requirements.txt

+2
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@ jupyter>=1
77
pandas>=0.17.1
88
numpy
99
notebook>=4.2
10+
# Work around broken-on-Python-2 pyrsistent release:
11+
pyrsistent < 0.17 ; python_version < '3.0'

hdijupyterutils/setup.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -64,5 +64,7 @@ def version(path):
6464
'jupyter>=1',
6565
'pandas>=0.17.1',
6666
'numpy',
67-
'notebook>=4.2'
67+
'notebook>=4.2',
68+
# Work around broken-on-Python-2 pyrsistent release:
69+
"pyrsistent < 0.17 ; python_version < '3.0'",
6870
])

sparkmagic/sparkmagic/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
__version__ = '0.15.0'
1+
__version__ = '0.16.0'
22

33
from sparkmagic.serverextension.handlers import load_jupyter_server_extension
44

0 commit comments

Comments
 (0)