This is an automated email from the ASF dual-hosted git repository.

ningk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/master by this push:
     new 31efffe  [BEAM-11045] Avoid broken deps
     new 33cd75f  Merge pull request #14465 from KevinGG/BEAM-11045
31efffe is described below

commit 31efffee2186aa65a3f2ece95b6813fea29ef003
Author: KevinGG <[email protected]>
AuthorDate: Wed Apr 7 15:00:56 2021 -0700

    [BEAM-11045] Avoid broken deps
    
    1. A new release: jupyter-client 6.1.13 breaks notebooks when getting
       messages.
    2. This is caught by screen diff integration tests of interactive beam.
    3. The issue is documented at 
https://github.com/jupyter/jupyter_client/issues/637
       ETA of the fix might be 6.2.x of jupyter-client.
    4. Added a timeout=-1 to allow indefinite wait for execution of each
       notebook cell in integration tests. The default value was 1 second.
       Instead of timeout each cell, moved the timeout to each test using 
pytest mark.
---
 .../runners/interactive/testing/integration/notebook_executor.py      | 3 ++-
 .../interactive/testing/integration/tests/init_square_cube_test.py    | 3 +++
 sdks/python/setup.py                                                  | 4 +++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git 
a/sdks/python/apache_beam/runners/interactive/testing/integration/notebook_executor.py
 
b/sdks/python/apache_beam/runners/interactive/testing/integration/notebook_executor.py
index 1051722..8478735 100644
--- 
a/sdks/python/apache_beam/runners/interactive/testing/integration/notebook_executor.py
+++ 
b/sdks/python/apache_beam/runners/interactive/testing/integration/notebook_executor.py
@@ -82,7 +82,8 @@ class NotebookExecutor(object):
     for path in self._paths:
       with open(path, 'r') as nb_f:
         nb = nbformat.read(nb_f, as_version=4)
-        ep = ExecutePreprocessor(allow_errors=True, kernel_name='test')
+        ep = ExecutePreprocessor(
+            timeout=-1, allow_errors=True, kernel_name='test')
         ep.preprocess(nb, {'metadata': {'path': os.path.dirname(path)}})
 
       execution_id = obfuscate(path)
diff --git 
a/sdks/python/apache_beam/runners/interactive/testing/integration/tests/init_square_cube_test.py
 
b/sdks/python/apache_beam/runners/interactive/testing/integration/tests/init_square_cube_test.py
index 95d94f4..5cd9184 100644
--- 
a/sdks/python/apache_beam/runners/interactive/testing/integration/tests/init_square_cube_test.py
+++ 
b/sdks/python/apache_beam/runners/interactive/testing/integration/tests/init_square_cube_test.py
@@ -22,9 +22,12 @@ from __future__ import absolute_import
 
 import unittest
 
+import pytest
+
 from apache_beam.runners.interactive.testing.integration.screen_diff import 
BaseTestCase
 
 
[email protected](300)
 class InitSquareCubeTest(BaseTestCase):
   def __init__(self, *args, **kwargs):
     kwargs['golden_size'] = (1024, 10000)
diff --git a/sdks/python/setup.py b/sdks/python/setup.py
index b68c690..775f321 100644
--- a/sdks/python/setup.py
+++ b/sdks/python/setup.py
@@ -206,7 +206,9 @@ INTERACTIVE_BEAM = [
     'facets-overview>=1.0.0,<2',
     'ipython>=5.8.0,<8',
     'ipykernel>=5.2.0,<6',
-    'jupyter-client>=6.1.11,<7',
+    # Skip version 6.1.13 due to
+    # https://github.com/jupyter/jupyter_client/issues/637
+    'jupyter-client>=6.1.11,<6.1.13',
     'timeloop>=1.0.2,<2',
 ]
 

Reply via email to