File tree Expand file tree Collapse file tree 4 files changed +2
-27
lines changed Expand file tree Collapse file tree 4 files changed +2
-27
lines changed Original file line number Diff line number Diff line change 11
11
fail-fast : false
12
12
matrix :
13
13
os : [ubuntu-latest, macos-latest, windows-latest]
14
- python-version : [ '3.5', '3. 6', '3.7', '3.8' ]
14
+ python-version : [ '3.6', '3.7', '3.8' ]
15
15
steps :
16
16
- name : Checkout
17
17
uses : actions/checkout@v1
Original file line number Diff line number Diff line change @@ -1244,14 +1244,6 @@ def init_configurables(self):
1244
1244
connection_dir = self .runtime_dir ,
1245
1245
kernel_spec_manager = self .kernel_spec_manager ,
1246
1246
)
1247
- # Async randomly hangs on Python 3.5, prevent using it
1248
- if isinstance (self .kernel_manager , AsyncMappingKernelManager ):
1249
- if sys .version_info < (3 , 6 ):
1250
- raise ValueError ("You are using `AsyncMappingKernelManager` in Python 3.5 (or lower),"
1251
- "which is not supported. Please upgrade Python to 3.6+." )
1252
- else :
1253
- self .log .info ("Asynchronous kernel management has been configured to use '{}'." .
1254
- format (self .kernel_manager .__class__ .__name__ ))
1255
1247
self .contents_manager = self .contents_manager_class (
1256
1248
parent = self ,
1257
1249
log = self .log ,
@@ -1325,7 +1317,6 @@ def init_webapp(self):
1325
1317
import ssl
1326
1318
# PROTOCOL_TLS selects the highest ssl/tls protocol version that both the client and
1327
1319
# server support. When PROTOCOL_TLS is not available use PROTOCOL_SSLv23.
1328
- # PROTOCOL_TLS is new in version 2.7.13, 3.5.3 and 3.6
1329
1320
self .ssl_options .setdefault (
1330
1321
'ssl_version' ,
1331
1322
getattr (ssl , 'PROTOCOL_TLS' , ssl .PROTOCOL_SSLv23 )
Original file line number Diff line number Diff line change 30
30
'Intended Audience :: Science/Research' ,
31
31
'License :: OSI Approved :: BSD License' ,
32
32
'Programming Language :: Python' ,
33
- 'Programming Language :: Python :: 3.5' ,
34
33
'Programming Language :: Python :: 3.6' ,
35
34
'Programming Language :: Python :: 3.7' ,
36
35
'Programming Language :: Python :: 3.8' ,
56
55
'pytest-console-scripts' , 'ipykernel' ],
57
56
'test:sys_platform == "win32"' : ['nose-exclude' ],
58
57
},
58
+ python_requires = '>=3.6' ,
59
59
entry_points = {
60
60
'console_scripts' : [
61
61
'jupyter-server = jupyter_server.serverapp:main' ,
Original file line number Diff line number Diff line change @@ -19,24 +19,8 @@ def test_config(serverapp):
19
19
assert serverapp .kernel_manager .allowed_message_types == ['kernel_info_request' ]
20
20
21
21
22
- @pytest .mark .skipif (
23
- sys .version_info < (3 , 6 ),
24
- reason = "Kernel manager is AsyncMappingKernelManager, Python version < 3.6"
25
- )
26
22
async def test_async_kernel_manager (configurable_serverapp ):
27
23
argv = ['--ServerApp.kernel_manager_class=jupyter_server.services.kernels.kernelmanager.AsyncMappingKernelManager' ]
28
24
app = configurable_serverapp (argv = argv )
29
25
assert isinstance (app .kernel_manager , AsyncMappingKernelManager )
30
26
31
-
32
- @pytest .mark .skipif (
33
- sys .version_info >= (3 , 6 ),
34
- reason = "Testing AsyncMappingKernelManager on Python <=3.5"
35
- )
36
- @pytest .mark .parametrize (
37
- "args" ,
38
- [['--ServerApp.kernel_manager_class=jupyter_server.services.kernels.kernelmanager.AsyncMappingKernelManager' ]]
39
- )
40
- async def test_async_kernel_manager_not_available_py35 (configurable_serverapp , args ):
41
- with pytest .raises (ValueError ):
42
- app = configurable_serverapp (argv = args )
You can’t perform that action at this time.
0 commit comments