update

VERSION

@@ -1 +1 @@
-v0.1.0
+0.1.0

coordinator/gscoordinator/coordinator.py

@@ -42,7 +42,6 @@
 # capture system stdout
 sys.stdout = StdoutWrapper(sys.stdout)
 
-from daemons.prefab import run
 from graphscope import __version__
 from graphscope.proto import attr_value_pb2
 from graphscope.proto import coordinator_service_pb2_grpc

coordinator/setup.py

@@ -22,6 +22,7 @@
 import sys
 from distutils.cmd import Command
 
+from graphscope import __version__
 from setuptools import find_packages
 from setuptools import setup
 from setuptools.command.build_py import build_py
@@ -140,7 +141,7 @@ def parsed_dev_reqs():
 
 setup(
     name="gscoordinator",
-    version="0.1",
+    version=__version__,
     description="",
     long_description=long_description,
     long_description_content_type="text/markdown",

interactive_engine/tests/function_test.sh

@@ -13,18 +13,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 curdir=$(cd "$(dirname "$0")"; pwd)
-__version__=`cat ${curdir}/../../VERSION`
+version=$(cat ${curdir}/../../VERSION)
+
 tmp_result="$curdir/tmp_result"
 function _start {
     _port=$1
     workers=$2
     gs_image=$3
     gie_manager_image=$4
     if [ -z "$gs_image" ]; then
-        gs_image="registry.cn-hongkong.aliyuncs.com/graphscope/graphscope:${__version__}"
+        gs_image="registry.cn-hongkong.aliyuncs.com/graphscope/graphscope:${version}"
     fi
     if [ -z "$gie_manager_image" ]; then
-        gie_manager_image="registry.cn-hongkong.aliyuncs.com/graphscope/maxgraph_standalone_manager:${__version__}"
+        gie_manager_image="registry.cn-hongkong.aliyuncs.com/graphscope/maxgraph_standalone_manager:${version}"
     fi
 
     export GS_TEST_DIR=$curdir/src/main/resources

python/graphscope/__init__.py

@@ -16,7 +16,6 @@
 # limitations under the License.
 #
 
-from graphscope._version import __version__
 from graphscope.analytical.app import *
 from graphscope.analytical.udf import declare
 from graphscope.analytical.udf.types import Vertex
@@ -29,3 +28,4 @@
 from graphscope.framework.graph import Graph
 from graphscope.framework.graph_utils import g
 from graphscope.framework.graph_utils import load_from
+from graphscope.version import __version__

python/graphscope/config.py

@@ -19,7 +19,7 @@
 """ GraphScope default configuration.
 """
 
-from graphscope._version import __version__
+from graphscope.version import __version__
 
 
 class GSConfig(object):

python/graphscope/_version.py → python/graphscope/version.py

@@ -25,5 +25,5 @@
 try:
     with open(os.path.join(git_root, "VERSION")) as f:
         __version__ = f.readline().rstrip()
-except:  # noqa: E722
+except OSError:
     __version__ == "latest"

python/setup.py

@@ -29,6 +29,8 @@
 from setuptools.command.sdist import sdist
 from wheel.bdist_wheel import bdist_wheel
 
+from graphscope import __version__
+
 repo_root = os.path.dirname(os.path.abspath(__file__))
 
 
@@ -237,7 +239,7 @@ def build_learning_engine():
 
 setup(
     name="graphscope",
-    version="0.1",
+    version=__version__,
     description="GraphScope: A One-Stop Large-Scale Graph Computing System from Alibaba",
     long_description=long_description,
     long_description_content_type="text/markdown",

scripts/prepare_env.sh

@@ -7,7 +7,7 @@ set -x
 set -o pipefail
 
 graphscope_home="$( cd "$(dirname "$0")/.." >/dev/null 2>&1 ; pwd -P )"
-__version__=`cat ${graphscope_home}/VERSION`
+version=$(cat ${graphscope_home}/VERSION)
 
 platform=$(awk -F= '/^NAME/{print $2}' /etc/os-release)
 is_in_wsl=false && [[ ! -z "${IS_WSL}" || ! -z "${WSL_DISTRO_NAME}" ]] && is_in_wsl=true
@@ -98,16 +98,16 @@ function launch_k8s_cluster() {
 
 function pull_images() {
   echo "$(date '+%Y-%m-%d %H:%M:%S') pulling GraphScope images."
-  sudo docker pull registry.cn-hongkong.aliyuncs.com/graphscope/graphscope:${__version__} || true
-  sudo docker pull registry.cn-hongkong.aliyuncs.com/graphscope/maxgraph_standalone_manager:${__version__} || true
+  sudo docker pull registry.cn-hongkong.aliyuncs.com/graphscope/graphscope:${version} || true
+  sudo docker pull registry.cn-hongkong.aliyuncs.com/graphscope/maxgraph_standalone_manager:${version} || true
   sudo docker pull zookeeper:3.4.14 || true
   sudo docker pull quay.io/coreos/etcd:v3.4.13 || true
   echo "$(date '+%Y-%m-%d %H:%M:%S') images pulled successfully."
 
   if [[ "${is_in_wsl}" = true ]]; then
     echo "$(date '+%Y-%m-%d %H:%M:%S') loading images into kind cluster."
-    sudo kind load registry.cn-hongkong.aliyuncs.com/graphscope/graphscope:${__version__} || true
-    sudo kind load registry.cn-hongkong.aliyuncs.com/graphscope/maxgraph_standalone_manager:${__version__} || true
+    sudo kind load registry.cn-hongkong.aliyuncs.com/graphscope/graphscope:${version} || true
+    sudo kind load registry.cn-hongkong.aliyuncs.com/graphscope/maxgraph_standalone_manager:${version} || true
     sudo kind load zookeeper:3.4.14 || true
     sudo kind load quay.io/coreos/etcd:v3.4.13 || true
     echo "$(date '+%Y-%m-%d %H:%M:%S') images loaded."

scripts/test.sh

@@ -6,13 +6,13 @@ set -euo pipefail
 
 # initialize variables
 graphscope_home="$( cd "$(dirname "$0")/.." >/dev/null 2>&1 ; pwd -P )"
-__version__=`cat ${graphscope_home}/VERSION`
+version=$(cat ${graphscope_home}/VERSION)
 
 platform=$(awk -F= '/^NAME/{print $2}' /etc/os-release)
 
 test_dir=""
-gs_image="registry.cn-hongkong.aliyuncs.com/graphscope/graphscope:${__version__}"
-gie_manager_image="registry.cn-hongkong.aliyuncs.com/graphscope/maxgraph_standalone_manager:${__version__}"
+gs_image="registry.cn-hongkong.aliyuncs.com/graphscope/graphscope:${version}"
+gie_manager_image="registry.cn-hongkong.aliyuncs.com/graphscope/maxgraph_standalone_manager:${version}"
 test_GIE=0
 test_on_k8s=0