Merge branch 'main' into fix_asv

luweizheng · Aug 21, 2024 · ce1239a · ce1239a
2 parents 61cdd20 + 37fc370
commit ce1239a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git 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
@@ -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/*
diff --git 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 = (