Skip to content

Support google-cloud-datacatalog 3.0.0#13224

Merged
mik-laj merged 1 commit intoapache:masterfrom
PolideaInternal:update-datacatalog-operators-2
Jan 4, 2021
Merged

Support google-cloud-datacatalog 3.0.0#13224
mik-laj merged 1 commit intoapache:masterfrom
PolideaInternal:update-datacatalog-operators-2

Conversation

@mik-laj
Copy link
Member

@mik-laj mik-laj commented Dec 21, 2020

Part of: #12116


^ Add meaningful description above

Read the Pull Request Guidelines for more information.
In case of fundamental code change, Airflow Improvement Proposal (AIP) is needed.
In case of a new dependency, check compliance with the ASF 3rd Party License Policy.
In case of backwards incompatible changes please leave a note in UPDATING.md.

@boring-cyborg boring-cyborg bot added the provider:google Google (including GCP) related issues label Dec 21, 2020
@mik-laj mik-laj force-pushed the update-datacatalog-operators-2 branch 2 times, most recently from 09652de to 41ba0b2 Compare December 22, 2020 16:11
@mik-laj mik-laj requested review from potiuk and turbaszek December 23, 2020 04:41
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
from google.protobuf import field_mask_pb2 as field_mask # type: ignore
from google.protobuf.field_mask_pb2 import FieldMask

Should we keep it unified with import in other places?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It just copied these lines from the Google library, but it will delete the alias, because it is not needed.

@github-actions github-actions bot added the full tests needed We need to run full set of tests for this PR to merge label Dec 31, 2020
@github-actions
Copy link

The PR most likely needs to run full matrix of tests because it modifies parts of the core of Airflow. However, committers might decide to merge it quickly and take the risk. If they don't merge it quickly - please rebase it to the latest master at your convenience, or amend the last commit of the PR, and push it with --force-with-lease.

@potiuk
Copy link
Member

potiuk commented Dec 31, 2020

Can you please rebase to latest version @mik-laj ? We will likely need to check if it works as intended with upgrading to latest deps.

@mik-laj mik-laj force-pushed the update-datacatalog-operators-2 branch from 9235af5 to 9c2f585 Compare January 4, 2021 06:24
@mik-laj mik-laj merged commit feb8405 into apache:master Jan 4, 2021
@mik-laj mik-laj deleted the update-datacatalog-operators-2 branch January 4, 2021 17:13
@XD-DENG
Copy link
Member

XD-DENG commented Jan 4, 2021

The Pylint check in master is broken. Based on the files pointed by Pylint, seems it's related to this PR. I'm taking a look into it, also FYI @mik-laj @potiuk

@potiuk
Copy link
Member

potiuk commented Jan 4, 2021

Strange. They seemed to pass in the PR.

@mik-laj
Copy link
Member Author

mik-laj commented Jan 4, 2021

I did a rebase this morning. i also have all the fancy labels for this PR, but it seems me the problem may be with the constraints file that contains the old version.

@kaxil
Copy link
Member

kaxil commented Jan 4, 2021

@mik-laj This is the error:

  E               AssertionError: 0 != 1 : import_errors={'/opt/airflow/airflow/providers/google/cloud/example_dags/example_datacatalog.py': 'Traceback (most recent call last):\n  File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed\n  File "/opt/airflow/airflow/providers/google/cloud/example_dags/example_datacatalog.py", line 22, in <module>\n    from google.cloud.datacatalog_v1beta1 import FieldType, TagField, TagTemplateField\nImportError: cannot import name \'FieldType\'\n'}
  

potiuk added a commit to PolideaInternal/airflow that referenced this pull request Jan 5, 2021
potiuk added a commit that referenced this pull request Jan 5, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

full tests needed We need to run full set of tests for this PR to merge provider:google Google (including GCP) related issues

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

Comments