From 028f2919c020b8c69e39c34f7ade8b0f02d0a7f4 Mon Sep 17 00:00:00 2001 From: Willy Lulciuc Date: Thu, 30 May 2019 12:55:12 -0700 Subject: [PATCH] Bump marquez-python to 0.5.0 (#27) --- marquez_airflow/dag.py | 7 +++---- setup.py | 2 +- tests/integration/integration_test.py | 4 ++-- tests/test_dag_extension.py | 6 +++--- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/marquez_airflow/dag.py b/marquez_airflow/dag.py index c9f5965cf01fe..93ac848f905a5 100644 --- a/marquez_airflow/dag.py +++ b/marquez_airflow/dag.py @@ -14,7 +14,7 @@ import pendulum import airflow.models -from marquez_client.client import Client +from marquez_client import MarquezClient from marquez_airflow.utils import JobIdMapping @@ -63,7 +63,6 @@ def handle_callback(self, *args, **kwargs): def report_jobrun(self, run_args, execution_date): job_name = self.dag_id - job_run_args = run_args start_time = DAG.to_airflow_time(execution_date) end_time = self.compute_endtime(execution_date) marquez_client = self.get_marquez_client() @@ -73,7 +72,7 @@ def report_jobrun(self, run_args, execution_date): self.marquez_input_urns, self.marquez_output_urns, description=self.description) marquez_jobrun = marquez_client.create_job_run( - job_name, job_run_args=job_run_args, + job_name, run_args=run_args, nominal_start_time=start_time, nominal_end_time=end_time) @@ -119,7 +118,7 @@ def log_marquez_event(self, args): def get_marquez_client(self): if not self._marquez_client: - self._marquez_client = Client( + self._marquez_client = MarquezClient( namespace_name=self.marquez_namespace) self._marquez_client.create_namespace(self.marquez_namespace, "default_owner") diff --git a/setup.py b/setup.py index 51b011b99300a..c316d37e0603a 100644 --- a/setup.py +++ b/setup.py @@ -29,6 +29,6 @@ url="https://github.com/MarquezProject/marquez-airflow", packages=setuptools.find_packages(), install_requires=[ - "marquez-python==0.3.2" + "marquez-python==0.5.0" ], ) diff --git a/tests/integration/integration_test.py b/tests/integration/integration_test.py index fbd6ada724d65..f74fa24a80fc4 100644 --- a/tests/integration/integration_test.py +++ b/tests/integration/integration_test.py @@ -10,7 +10,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from marquez_client.client import Client +from marquez_client import MarquezClient import logging import os @@ -27,7 +27,7 @@ def test_data_in_marquez(wait_for_marquez, init_airflow_db): execution_date = "2019-02-01T00:00:00" namespace = "integration-test" - c = Client(namespace_name=namespace) + c = MarquezClient(namespace_name=namespace) assert(trigger_dag(dag_id, execution_date)) assert(check_dag_state(dag_id, execution_date)) diff --git a/tests/test_dag_extension.py b/tests/test_dag_extension.py index 5b4784ae6d17f..3097ef1b217da 100644 --- a/tests/test_dag_extension.py +++ b/tests/test_dag_extension.py @@ -13,7 +13,7 @@ from airflow.utils.state import State from contextlib import contextmanager from datetime import datetime -from marquez_client.client import Client +from marquez_client import MarquezClient from marquez_airflow import DAG from unittest.mock import Mock, create_autospec, patch @@ -130,7 +130,7 @@ def assert_marquez_calls_for_dagrun(test_dag): test_dag.output_urns, description=test_dag.description) marquez_client.create_job_run.assert_called_once_with( - test_dag.dag_id, job_run_args="{}", + test_dag.dag_id, run_args="{}", nominal_start_time=DAG.to_airflow_time(test_dag.start_date), nominal_end_time=test_dag.marquez_dag.compute_endtime( test_dag.start_date)) @@ -139,7 +139,7 @@ def assert_marquez_calls_for_dagrun(test_dag): def make_mock_marquez_client(run_id): mock_marquez_jobrun = Mock() mock_marquez_jobrun.run_id = run_id - mock_marquez_client = create_autospec(Client) + mock_marquez_client = create_autospec(MarquezClient) mock_marquez_client.create_job_run.return_value = mock_marquez_jobrun return mock_marquez_client