Bump up vineyard to v0.14.5 (#2676)

Also fixes CI
alibaba · May 9, 2023 · b258999 · b258999
1 parent ff5809e
commit b258999
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 13 deletions.
diff --git a/.github/workflows/build-graphscope-wheels-linux.yml b/.github/workflows/build-graphscope-wheels-linux.yml
@@ -49,13 +49,14 @@ jobs:
 
         cd ${GITHUB_WORKSPACE}/k8s/internal
         # build graphscope wheels
-        sudo -E -u runner make graphscope-py3-package GRAPHSCOPE_HOME=/opt/graphscope INSTALL_PREFIX=${GITHUB_WORKSPACE}/install
+        sudo -E -u runner make graphscope-py3-package GRAPHSCOPE_HOME=/opt/graphscope
 
         # build client wheels
         sudo -E -u runner make graphscope-client-py3-package GRAPHSCOPE_HOME=/opt/graphscope
 
         # package
         cd ${GITHUB_WORKSPACE}
+        sudo chown $(id -u) -R .
         tar -zcf client.tar.gz python/dist/wheelhouse/*.whl
         tar -zcf graphscope.tar.gz coordinator/dist/
 

diff --git a/.github/workflows/build-graphscope-wheels-macos.yml b/.github/workflows/build-graphscope-wheels-macos.yml
@@ -160,7 +160,7 @@ jobs:
       run: |
         . ~/.graphscope_env
         python3 -m pip install libclang
-        git clone --single-branch -b v0.14.0 --depth=1 https://github.com/v6d-io/v6d.git /tmp/v6d
+        git clone --single-branch -b v0.14.5 --depth=1 https://github.com/v6d-io/v6d.git /tmp/v6d
         cd /tmp/v6d
         git submodule update --init
         cmake .  -DCMAKE_INSTALL_PREFIX=/usr/local \

diff --git a/.github/workflows/gae.yml b/.github/workflows/gae.yml
@@ -29,7 +29,7 @@ jobs:
     runs-on: ubuntu-20.04
     if: ${{ github.repository == 'alibaba/GraphScope' }}
     container:
-      image: registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-dev:v0.14.0
+      image: registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-dev:v0.14.5
     steps:
     - uses: actions/checkout@v3
 

diff --git a/.github/workflows/networkx-forward-algo-nightly.yml b/.github/workflows/networkx-forward-algo-nightly.yml
@@ -17,7 +17,7 @@ jobs:
       run:
         shell: bash --noprofile --norc -eo pipefail {0}
     container:
-      image: registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-dev:v0.14.0
+      image: registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-dev:v0.14.5
       options:
         --shm-size 4096m
 

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -43,7 +43,7 @@ jobs:
         fi
         sudo mkdir /opt/graphscope
         sudo chown -R $(id -u):$(id -g) /opt/graphscope
-        ./gs install-deps dev --v6d-version v0.14.0
+        ./gs install-deps dev --v6d-version v0.14.5
 
     - name: Setup tmate session
       if: false 

diff --git a/analytical_engine/java/grape-runtime/CMakeLists.txt b/analytical_engine/java/grape-runtime/CMakeLists.txt
@@ -83,7 +83,7 @@ find_package(libgrapelite REQUIRED)
 include_directories(SYSTEM ${LIBGRAPELITE_INCLUDE_DIRS})
 
 # find vineyard ---------------------------------------------
-find_package(vineyard 0.14.0 REQUIRED)
+find_package(vineyard 0.14.5 REQUIRED)
 include_directories(${VINEYARD_INCLUDE_DIRS})
 
 add_library(grape-jni SHARED ${SOURCES})

diff --git a/coordinator/requirements.txt b/coordinator/requirements.txt
@@ -13,4 +13,3 @@ prometheus-client>=0.14.1
 setuptools==65.7.0
 packaging
 tqdm
-urllib3>=1.24.2,<2.0.0
diff --git a/k8s/Makefile b/k8s/Makefile
@@ -7,7 +7,7 @@ ifeq ($(REGISTRY),)
 endif
 
 VERSION ?= latest
-VINEYARD_VERSION ?= v0.14.0
+VINEYARD_VERSION ?= v0.14.5
 # This is the version of builder base image in most cases, except for graphscope-dev
 BUILDER_VERSION ?= $(VINEYARD_VERSION)
 # This is the version of runtime base image

diff --git a/k8s/actions-runner-controller/manylinux/Makefile b/k8s/actions-runner-controller/manylinux/Makefile
@@ -12,7 +12,7 @@ TARGETPLATFORM ?= $(shell arch)
 RUNNER_VERSION ?= 2.287.1
 DOCKER_VERSION ?= 20.10.12
 
-VINEYARD_VERSION ?= v0.14.0
+VINEYARD_VERSION ?= v0.14.5
 BUILDER_VERSION ?= $(VINEYARD_VERSION)
 
 # default list of platforms for which multiarch image is built

diff --git a/k8s/internal/Makefile b/k8s/internal/Makefile
@@ -37,7 +37,7 @@ GRAPHSCOPE_HOME ?= /usr/local
 INSTALL_PREFIX ?= /opt/graphscope
 
 VERSION ?= latest
-VINEYARD_VERSION ?= v0.14.0
+VINEYARD_VERSION ?= v0.14.5
 PROFILE ?= release
 CI ?= false
 
@@ -100,7 +100,6 @@ graphscope-manylinux2014-py3-nodocker:
 	for _ in {1..5}; do if make INSTALL_PREFIX=${INSTALL_PREFIX}; then break; fi; done && \
 	for _ in {1..5}; do if $(MAKE_INSTALL_COMMAND); then break; fi; done && \
 	if [ ${INSTALL_PREFIX} != ${GRAPHSCOPE_HOME} ]; then sudo cp -rsn ${INSTALL_PREFIX}/* ${GRAPHSCOPE_HOME}/; fi && \
-	sed -i -i '199i\    vineyardctl_path = None' "/home/graphscope/.local/lib/python3.8/site-packages/vineyard/deploy/utils.py" && \
 	python3 $(WORKING_DIR)/../utils/precompile.py --graph --app && \
 	export WITH_EXTRA_DATA=ON && \
 	export GRAPHSCOPE_HOME=${GRAPHSCOPE_HOME} && \

diff --git a/scripts/install_deps.sh b/scripts/install_deps.sh
@@ -14,8 +14,8 @@ readonly GREEN="\033[0;32m"
 readonly NC="\033[0m" # No Color
 
 readonly GRAPE_BRANCH="master" # libgrape-lite branch
-readonly V6D_VERSION="0.14.0"  # vineyard version
-readonly V6D_BRANCH="v0.14.0" # vineyard branch
+readonly V6D_VERSION="0.14.5"  # vineyard version
+readonly V6D_BRANCH="v0.14.5" # vineyard branch
 
 readonly OUTPUT_ENV_FILE="${HOME}/.graphscope_env"
 IS_IN_WSL=false && [[ ! -z "${IS_WSL}" || ! -z "${WSL_DISTRO_NAME}" ]] && IS_IN_WSL=true