Skip to content

Commit

Permalink
Drop Python 3.5
Browse files Browse the repository at this point in the history
  • Loading branch information
kevin-bates committed Jan 27, 2021
1 parent a9f0469 commit 2a90e23
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 14 deletions.
2 changes: 1 addition & 1 deletion notebook/_version.py
Expand Up @@ -9,5 +9,5 @@

# Next beta/alpha/rc release: The version number for beta is X.Y.ZbN **without dots**.

version_info = (7, 0, 0, '.dev0')
version_info = (6, 3, 0, '.dev0')
__version__ = '.'.join(map(str, version_info[:3])) + ''.join(version_info[3:])
3 changes: 0 additions & 3 deletions notebook/notebookapp.py
Expand Up @@ -1611,9 +1611,6 @@ def init_configurables(self):
)
# Ensure the appropriate version of Python and jupyter_client is available.
if isinstance(self.kernel_manager, AsyncMappingKernelManager):
if sys.version_info < (3, 6): # Can be removed once 3.5 is dropped.
raise ValueError("You are using `AsyncMappingKernelManager` in Python 3.5 (or lower) "
"which is not supported. Please upgrade Python to 3.6+ or change kernel managers.")
if not async_kernel_mgmt_available: # Can be removed once jupyter_client >= 6.1 is required.
raise ValueError("You are using `AsyncMappingKernelManager` without an appropriate "
"jupyter_client installed! Please upgrade jupyter_client or change kernel managers.")
Expand Down
2 changes: 0 additions & 2 deletions notebook/services/kernels/tests/test_kernels_api.py
Expand Up @@ -204,8 +204,6 @@ class AsyncKernelAPITest(KernelAPITest):
def setup_class(cls):
if not async_testing_enabled: # Can be removed once jupyter_client >= 6.1 is required.
raise SkipTest("AsyncKernelAPITest tests skipped due to down-level jupyter_client!")
if sys.version_info < (3, 6): # Can be removed once 3.5 is dropped.
raise SkipTest("AsyncKernelAPITest tests skipped due to Python < 3.6!")
super(AsyncKernelAPITest, cls).setup_class()

@classmethod
Expand Down
2 changes: 0 additions & 2 deletions notebook/services/sessions/tests/test_sessions_api.py
Expand Up @@ -273,8 +273,6 @@ class AsyncSessionAPITest(SessionAPITest):
def setup_class(cls):
if not async_testing_enabled: # Can be removed once jupyter_client >= 6.1 is required.
raise SkipTest("AsyncSessionAPITest tests skipped due to down-level jupyter_client!")
if sys.version_info < (3, 6): # Can be removed once 3.5 is dropped.
raise SkipTest("AsyncSessionAPITest tests skipped due to Python < 3.6!")
super(AsyncSessionAPITest, cls).setup_class()

@classmethod
Expand Down
2 changes: 1 addition & 1 deletion notebook/static/base/js/namespace.js
Expand Up @@ -73,7 +73,7 @@ define(function(){
// tree
jglobal('SessionList','tree/js/sessionlist');

Jupyter.version = "7.0.0.dev0";
Jupyter.version = "6.3.0.dev0";
Jupyter._target = '_blank';

return Jupyter;
Expand Down
11 changes: 6 additions & 5 deletions setup.py
Expand Up @@ -15,7 +15,7 @@

name = "notebook"

if sys.version_info < (3, 5):
if sys.version_info < (3, 6):
pip_message = 'This may be due to an out of date pip. Make sure you have pip >= 9.0.1.'
try:
import pip
Expand All @@ -31,7 +31,8 @@


error = """
Notebook 6.0+ supports Python 3.5 and above.
Notebook 6.3+ supports Python 3.6 and above.
When using Python 3.5, please install Notebook <= 6.2.
When using Python 3.4 or earlier (including 2.7), please install Notebook 5.x.
Python {py} detected.
Expand Down Expand Up @@ -90,10 +91,10 @@
'License :: OSI Approved :: BSD License',
'Programming Language :: Python',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8'
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9'
],
zip_safe = False,
install_requires = [
Expand Down Expand Up @@ -121,7 +122,7 @@
'test:sys_platform != "win32"': ['requests-unixsocket'],
'json-logging': ['json-logging']
},
python_requires = '>=3.5',
python_requires = '>=3.6',
entry_points = {
'console_scripts': [
'jupyter-notebook = notebook.notebookapp:main',
Expand Down

0 comments on commit 2a90e23

Please sign in to comment.