From 37fc370a235e1af923e1b725c23d56e9561b0abd Mon Sep 17 00:00:00 2001
From: Weizheng Lu <luweizheng36@hotmail.com>
Date: Wed, 21 Aug 2024 22:10:20 +0800
Subject: [PATCH] ENH: Fix vineyard compatibility issue (#783)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
---
 .github/workflows/python.yaml            |  2 +-
 .gitignore                               |  6 +++++-
 python/xorbits/_mars/storage/vineyard.py | 10 +++++-----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/python.yaml b/.github/workflows/python.yaml
index 34474dbe1..1d92f6d5b 100644
--- a/.github/workflows/python.yaml
+++ b/.github/workflows/python.yaml
@@ -181,7 +181,7 @@ jobs:
           conda install --quiet --yes -c conda-forge skein libffi conda-pack grpcio=1.42.0
         fi
         if [[ "$MODULE" == "vineyard" ]]; then
-          pip install "vineyard<0.16.1" -i https://pypi.org/simple
+          pip install vineyard
           mkdir -p /tmp/etcd-download-test
           export ETCD_VER=v3.4.13
           export ETCD_DOWNLOAD_URL=https://github.com/etcd-io/etcd/releases/download
diff --git a/.gitignore b/.gitignore
index a27ce3f69..8f0a203b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -153,5 +153,9 @@ asv/results
 
 .DS_Store
 
-#slrm.sh generated sh
+# slurm.sh generated sh
 python/xorbits/deploy/slurm/tests/slurm.sh
+
+# vineyard & etcd
+
+python/default.etcd/*
\ No newline at end of file
diff --git a/python/xorbits/_mars/storage/vineyard.py b/python/xorbits/_mars/storage/vineyard.py
index 931556a16..663aa0b5d 100644
--- a/python/xorbits/_mars/storage/vineyard.py
+++ b/python/xorbits/_mars/storage/vineyard.py
@@ -143,11 +143,11 @@ async def setup(cls, **kwargs) -> Tuple[Dict, Dict]:
             vineyard_store = None
         else:
             vineyard_store = vineyard.deploy.local.start_vineyardd(
-                etcd_endpoints,
-                etcd_prefix,
-                vineyardd_path,
-                vineyard_size,
-                vineyard_socket,
+                etcd_endpoints=etcd_endpoints,
+                etcd_prefix=etcd_prefix,
+                vineyardd_path=vineyardd_path,
+                size=vineyard_size,
+                socket=vineyard_socket,
                 rpc=False,
             )
             vineyard_socket = (