From d7a0d93a630e5344386a2abe113906bd4a65f0b2 Mon Sep 17 00:00:00 2001 From: Dongze Li Date: Fri, 26 Jan 2024 17:45:16 +0800 Subject: [PATCH] ci: Fix ci failure and pre-release v0.27.0 (#3512) --- VERSION | 2 +- analytical_engine/java/pom.xml | 2 +- charts/graphscope-store/Chart.yaml | 2 +- charts/graphscope/Chart.yaml | 4 ++-- .../gscoordinator/kubernetes_launcher.py | 24 ++++++++++++------- python/graphscope/analytical/udf/wrapper.py | 8 ++++--- .../builtin/test_closeness_centrality.py | 1 + python/graphscope/nx/classes/cache.py | 6 ++--- 8 files changed, 29 insertions(+), 20 deletions(-) diff --git a/VERSION b/VERSION index 4e8f395fa5e3..1b58cc10180e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.26.0 +0.27.0 diff --git a/analytical_engine/java/pom.xml b/analytical_engine/java/pom.xml index 0ddb3130ca45..00011a6fdf75 100644 --- a/analytical_engine/java/pom.xml +++ b/analytical_engine/java/pom.xml @@ -64,7 +64,7 @@ - 0.26.0 + 0.27.0 0.1.2 0.19 3.3.11 diff --git a/charts/graphscope-store/Chart.yaml b/charts/graphscope-store/Chart.yaml index feafd5d5f712..0ebb51411095 100644 --- a/charts/graphscope-store/Chart.yaml +++ b/charts/graphscope-store/Chart.yaml @@ -19,7 +19,7 @@ sources: maintainers: - name: GraphScope url: https://github.com/alibaba/graphscope -version: 0.26.0 +version: 0.27.0 dependencies: - condition: kafka.enabled diff --git a/charts/graphscope/Chart.yaml b/charts/graphscope/Chart.yaml index 877144659537..540fbdc257c7 100644 --- a/charts/graphscope/Chart.yaml +++ b/charts/graphscope/Chart.yaml @@ -26,10 +26,10 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.26.0 +version: 0.27.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "0.26.0" +appVersion: "0.27.0" diff --git a/coordinator/gscoordinator/kubernetes_launcher.py b/coordinator/gscoordinator/kubernetes_launcher.py index 305e98d51fe8..762e2a45d56f 100644 --- a/coordinator/gscoordinator/kubernetes_launcher.py +++ b/coordinator/gscoordinator/kubernetes_launcher.py @@ -413,15 +413,21 @@ def deploy_engine(self, engine_type, object_id=None): setattr(self, f"_{engine_type}_pod_host_ip", self._pod_host_ip_list) return ( - getattr(self, f"_{engine_type}_pod_name") - if object_id is None - else getattr(self, f"_{engine_type}_pod_name")[object_id], - getattr(self, f"_{engine_type}_pod_ip") - if object_id is None - else getattr(self, f"_{engine_type}_pod_ip")[object_id], - getattr(self, f"_{engine_type}_pod_host_ip") - if object_id is None - else getattr(self, f"_{engine_type}_pod_host_ip")[object_id], + ( + getattr(self, f"_{engine_type}_pod_name") + if object_id is None + else getattr(self, f"_{engine_type}_pod_name")[object_id] + ), + ( + getattr(self, f"_{engine_type}_pod_ip") + if object_id is None + else getattr(self, f"_{engine_type}_pod_ip")[object_id] + ), + ( + getattr(self, f"_{engine_type}_pod_host_ip") + if object_id is None + else getattr(self, f"_{engine_type}_pod_host_ip")[object_id] + ), ) def delete_engine_stateful_set_with_object_id(self, engine_type, object_id): diff --git a/python/graphscope/analytical/udf/wrapper.py b/python/graphscope/analytical/udf/wrapper.py index 8fd0a79bcc75..4e1a587e95c3 100644 --- a/python/graphscope/analytical/udf/wrapper.py +++ b/python/graphscope/analytical/udf/wrapper.py @@ -39,9 +39,11 @@ def wrap_init( { "algo": module_name, "context_type": "labeled_vertex_data", - "type": "cython_pie" - if program_model == ProgramModel.PIE - else "cython_pregel", + "type": ( + "cython_pie" + if program_model == ProgramModel.PIE + else "cython_pregel" + ), "class_name": "gs::PregelPropertyAppBase", "compatible_graph": ["vineyard::ArrowFragment"], "vd_type": vd_type, diff --git a/python/graphscope/nx/algorithms/tests/builtin/test_closeness_centrality.py b/python/graphscope/nx/algorithms/tests/builtin/test_closeness_centrality.py index 7027f388f5e3..441c4a83a6a2 100644 --- a/python/graphscope/nx/algorithms/tests/builtin/test_closeness_centrality.py +++ b/python/graphscope/nx/algorithms/tests/builtin/test_closeness_centrality.py @@ -1,6 +1,7 @@ """ Tests for closeness centrality. """ + import pytest from networkx.testing import almost_equal diff --git a/python/graphscope/nx/classes/cache.py b/python/graphscope/nx/classes/cache.py index f961b0c0c2f1..66ad37fa2fad 100644 --- a/python/graphscope/nx/classes/cache.py +++ b/python/graphscope/nx/classes/cache.py @@ -271,9 +271,9 @@ def clear(self): self.succ_attr_cache = () self.pred_cache = () self.pred_attr_cache = () - self.node_attr_align = ( - self.succ_align - ) = self.succ_attr_align = self.pred_align = self.pred_attr_align = False + self.node_attr_align = self.succ_align = self.succ_attr_align = ( + self.pred_align + ) = self.pred_attr_align = False self.get_node_attr.cache_clear() self.get_successors.cache_clear() self.get_succ_attr.cache_clear()