Skip to content

Commit 9c6668b

Browse files
committed
no longer skip ipyparallel tests on Python 3.8
1 parent 19c1e0e commit 9c6668b

2 files changed

Lines changed: 2 additions & 13 deletions

File tree

adaptive/runner.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import inspect
66
import itertools
77
import pickle
8-
import sys
98
import time
109
import traceback
1110
import warnings
@@ -14,13 +13,9 @@
1413
from adaptive.notebook_integration import in_ipynb, live_info, live_plot
1514

1615
try:
17-
if sys.version_info < (3, 8):
18-
# XXX: remove when ipyparallel 6.2.5 is released
19-
import ipyparallel
16+
import ipyparallel
2017

21-
with_ipyparallel = True
22-
else:
23-
with_ipyparallel = False
18+
with_ipyparallel = True
2419
except ModuleNotFoundError:
2520
with_ipyparallel = False
2621

adaptive/tests/test_runner.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,6 @@ async def f(x):
7474

7575
@pytest.fixture(scope="session")
7676
def ipyparallel_executor():
77-
if sys.version_info[:2] == (3, 8):
78-
# ipyparallel is broken on Python 3.8
79-
# https://github.com/ipython/ipyparallel/issues/404
80-
pytest.skip()
8177
from ipyparallel import Client
8278

8379
if os.name == "nt":
@@ -121,9 +117,7 @@ def test_stop_after_goal():
121117
assert stop_time - start_time > seconds_to_wait
122118

123119

124-
# https://github.com/ipython/ipyparallel/issues/404
125120
@pytest.mark.skipif(not with_ipyparallel, reason="IPyparallel is not installed")
126-
@pytest.mark.skipif(sys.version_info[:2] == (3, 8), reason="ipyparallel broken on 3.8")
127121
def test_ipyparallel_executor(ipyparallel_executor):
128122
learner = Learner1D(linear, (-1, 1))
129123
BlockingRunner(learner, trivial_goal, executor=ipyparallel_executor)

0 commit comments

Comments
 (0)