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 76ee783 Misc Fixes
new 3f3a7fb Merge pull request #15163 from KevinGG/fix_dep
76ee783 is described below
commit 76ee7830602aac64f00bc12db4c0be818b7d699a
Author: KevinGG <kawai...@gmail.com>
AuthorDate: Mon Jul 12 17:23:59 2021 -0700
Misc Fixes
1. Moved google-api-core from 1.22.0 to 1.22.2 since the newly added
google-cloud-recommendations-ai's upperbound 0.2.0 has requirement
google-api-core[grpc]<2.0.0dev,>=1.22.2.
2. Renamed screen_diff_tests.py to screen_diff_test.py so that pytest can
recognize the tests. Updated the screenshots for Darwin.
---
.../Darwin/29c9237ddf4f3d5988a503069b4d3c47.png | Bin 0 -> 67298 bytes
.../Darwin/7a35f487b2a5f3a9b9852a8659eeb4bd.png | Bin 748019 -> 760584 bytes
.../{screen_diff_tests.py => screen_diff_test.py} | 14 +++++++++-----
sdks/python/container/base_image_requirements.txt | 2 +-
4 files changed, 10 insertions(+), 6 deletions(-)
diff --git
a/sdks/python/apache_beam/runners/interactive/testing/integration/goldens/Darwin/29c9237ddf4f3d5988a503069b4d3c47.png
b/sdks/python/apache_beam/runners/interactive/testing/integration/goldens/Darwin/29c9237ddf4f3d5988a503069b4d3c47.png
new file mode 100644
index 0000000..8463b3f
Binary files /dev/null and
b/sdks/python/apache_beam/runners/interactive/testing/integration/goldens/Darwin/29c9237ddf4f3d5988a503069b4d3c47.png
differ
diff --git
a/sdks/python/apache_beam/runners/interactive/testing/integration/goldens/Darwin/7a35f487b2a5f3a9b9852a8659eeb4bd.png
b/sdks/python/apache_beam/runners/interactive/testing/integration/goldens/Darwin/7a35f487b2a5f3a9b9852a8659eeb4bd.png
index 08de5a4..2179619 100644
Binary files
a/sdks/python/apache_beam/runners/interactive/testing/integration/goldens/Darwin/7a35f487b2a5f3a9b9852a8659eeb4bd.png
and
b/sdks/python/apache_beam/runners/interactive/testing/integration/goldens/Darwin/7a35f487b2a5f3a9b9852a8659eeb4bd.png
differ
diff --git
a/sdks/python/apache_beam/runners/interactive/testing/integration/tests/screen_diff_tests.py
b/sdks/python/apache_beam/runners/interactive/testing/integration/tests/screen_diff_test.py
similarity index 81%
rename from
sdks/python/apache_beam/runners/interactive/testing/integration/tests/screen_diff_tests.py
rename to
sdks/python/apache_beam/runners/interactive/testing/integration/tests/screen_diff_test.py
index bcff805..0d36c88 100644
---
a/sdks/python/apache_beam/runners/interactive/testing/integration/tests/screen_diff_tests.py
+++
b/sdks/python/apache_beam/runners/interactive/testing/integration/tests/screen_diff_test.py
@@ -23,9 +23,6 @@ import unittest
import pytest
from apache_beam.runners.interactive.testing.integration.screen_diff import
BaseTestCase
-from selenium.webdriver.common.by import By
-from selenium.webdriver.support import expected_conditions
-from selenium.webdriver.support.ui import WebDriverWait
@pytest.mark.timeout(300)
@@ -35,8 +32,15 @@ class DataFramesTest(BaseTestCase):
super(DataFramesTest, self).__init__(*args, **kwargs)
def explicit_wait(self):
- WebDriverWait(self.driver, 5).until(
- expected_conditions.presence_of_element_located((By.ID, 'test-done')))
+ try:
+ from selenium.webdriver.common.by import By
+ from selenium.webdriver.support import expected_conditions
+ from selenium.webdriver.support.ui import WebDriverWait
+
+ WebDriverWait(self.driver, 5).until(
+ expected_conditions.presence_of_element_located((By.ID,
'test-done')))
+ except:
+ pass # The test will be ignored.
def test_dataframes(self):
self.assert_notebook('dataframes')
diff --git a/sdks/python/container/base_image_requirements.txt
b/sdks/python/container/base_image_requirements.txt
index 04efbf5..2926ff1 100644
--- a/sdks/python/container/base_image_requirements.txt
+++ b/sdks/python/container/base_image_requirements.txt
@@ -43,7 +43,7 @@ typing-extensions==3.7.4.3
# GCP extra features
google-auth==1.31.0
-google-api-core==1.22.0
+google-api-core==1.22.2
google-apitools==0.5.31
google-cloud-pubsub==1.0.2
google-cloud-bigquery==1.26.1
