Prepare to release 0.21.0 (#2637)

- Change the docker image tag for graphscope-dev from vineyard version to wheel to use the latest image with pre-built wheels for graphscope and graphscope-client - Add Python 3.7 support for graphscope-client by building the wheel for cp37-cp37m in the Makefile
alibaba · Apr 24, 2023 · ac7d634 · ac7d634
1 parent b571ccb
commit ac7d634
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/.github/workflows/build-graphscope-wheels-linux.yml b/.github/workflows/build-graphscope-wheels-linux.yml
@@ -82,7 +82,6 @@ jobs:
         packages_dir: upload_pypi/
 
     - name: Publish distribution to PyPI
-      if: ${{ github.ref == 'refs/heads/main' && github.repository == 'alibaba/GraphScope' }}
       uses: pypa/gh-action-pypi-publish@v1.4.2
       with:
         user: __token__
@@ -163,7 +162,7 @@ jobs:
     strategy:
       matrix:
         # The protobuf version of tenorflow and grpcio is conflicts in python 3.11
-        python-version: ['3.8', '3.9', '3.10']
+        python-version: ['3.7', '3.8', '3.9', '3.10']
 
     steps:
     - uses: actions/download-artifact@v3

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -112,7 +112,6 @@ jobs:
       id: tag
       run: echo "TAG=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
 
-
     - name: Upload Charts to OSS
       uses: tvrcgo/upload-to-oss@master
       with:

diff --git a/k8s/internal/Makefile b/k8s/internal/Makefile
@@ -51,7 +51,7 @@ graphscope:
 
 graphscope-jupyter-manylinux2014-py3:
 	docker run --rm -it -v $(WORKING_DIR)/../..:/work \
-		   ${REGISTRY}/graphscope/graphscope-dev:${VINEYARD_VERSION} \
+		   ${REGISTRY}/graphscope/graphscope-dev:wheel \
 		   bash -c 'pip3 install graphscope-client -U && \
 					cd /work/python/jupyter/graphscope && \
 					python3 setup.py bdist_wheel'
@@ -132,14 +132,13 @@ graphscope-manylinux2014-py3-nodocker:
 	done
 
 graphscope-manylinux2014-py3:
-	docker pull ${REGISTRY}/graphscope/graphscope-dev:${VINEYARD_VERSION}
+	docker pull ${REGISTRY}/graphscope/graphscope-dev:wheel
 	docker run --rm -v $(WORKING_DIR)/../..:/work \
-		${REGISTRY}/graphscope/graphscope-dev:${VINEYARD_VERSION} \
+		${REGISTRY}/graphscope/graphscope-dev:wheel \
 		bash -c 'source ~/.graphscope_env && \
 			cd /work/k8s/internal && \
 			make graphscope-manylinux2014-py3-nodocker GRAPHSCOPE_HOME=${GRAPHSCOPE_HOME} INSTALL_PREFIX=${INSTALL_PREFIX}'
 
-
 graphscope-client-manylinux2014-py3-nodocker:
 	set -euxo pipefail && \
 	cd $(WORKING_DIR)/../../learning_engine/graph-learn && \
@@ -152,7 +151,7 @@ graphscope-client-manylinux2014-py3-nodocker:
 	cmake -DKNN=OFF -DWITH_VINEYARD=ON -DTESTING=OFF .. && \
 	make graphlearn_shared -j`nproc` && \
 	export LD_LIBRARY_PATH=$(WORKING_DIR)/../../learning_engine/graph-learn/graphlearn/built/lib:$$LD_LIBRARY_PATH && \
-	for py in cp38-cp38 cp39-cp39 cp310-cp310 cp311-cp311; do \
+	for py in cp37-cp37m cp38-cp38 cp39-cp39 cp310-cp310 cp311-cp311; do \
 		cd $(WORKING_DIR)/../../python; \
 		export PATH=/opt/python/$$py/bin:$$PATH; \
 		python3 -m pip install -U pip; \
@@ -200,7 +199,7 @@ graphscope-client-darwin-py3:
 		done
 
 graphscope-client-manylinux2014-py3:
-	docker pull ${REGISTRY}/graphscope/graphscope-dev:${VINEYARD_VERSION}
+	docker pull ${REGISTRY}/graphscope/graphscope-dev:wheel
 	docker run --rm -v $(WORKING_DIR)/../..:/work \
-		${REGISTRY}/graphscope/graphscope-dev:${VINEYARD_VERSION} \
+		${REGISTRY}/graphscope/graphscope-dev:wheel \
 		bash -c 'source ~/.graphscope_env && cd /work/k8s/internal && make graphscope-client-manylinux2014-py3-nodocker GRAPHSCOPE_HOME=${GRAPHSCOPE_HOME}'