Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history
  • Loading branch information
lidongze0629 committed Jan 17, 2023
1 parent 9bdc190 commit b95179b
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 24 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/build-graphscope-wheels-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,8 @@ jobs:
needs: [build-wheels]
strategy:
matrix:
python-version: ['3.7', '3.8', '3.9']
# The protobuf version of tenorflow and grpcio is conflicts in python 3.11
python-version: ['3.7', '3.8', '3.9', '3.10']

steps:
- uses: actions/download-artifact@v3
Expand Down Expand Up @@ -214,8 +215,8 @@ jobs:
popd
# install tensorflow
if [ "${{ matrix.python-version }}" == "3.10" ] || [ "${{ matrix.python-version }}" == "3.11" ]; then
python3 -m pip install pytest "tensorflow" "pandas" --user
if [ "${{ matrix.python-version }}" == "3.10" ]; then
python3 -m pip install pytest "tensorflow<=2.8.4" "pandas" --user
else
python3 -m pip install pytest "tensorflow<=2.5.2" "pandas" --user
fi
Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/build-graphscope-wheels-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,8 @@ jobs:
needs: [build-wheels, build-client-wheels]
strategy:
matrix:
python-version: ['3.7', '3.8', '3.9']
# The protobuf version of tenorflow and grpcio is conflicts in python 3.11
python-version: ['3.7', '3.8', '3.9', '3.10']

steps:
- uses: actions/download-artifact@v3
Expand All @@ -212,7 +213,11 @@ jobs:
popd
# install tensorflow
python3 -m pip install pytest "tensorflow<=2.5.2" "pandas<1.5.0" --user
if [ "${{ matrix.python-version }}" == "3.10" ]; then
python3 -m pip install pytest "tensorflow<=2.8.4" "pandas" --user
else
python3 -m pip install pytest "tensorflow<=2.5.2" "pandas<1.5.0" --user
fi
- name: Run Minimum Test
env:
Expand Down
12 changes: 6 additions & 6 deletions coordinator/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
etcd-distro>=3.5.1
graphscope-client>=0.11.0
grpcio;python_version>="3.10"
grpcio<=1.43.0,>=1.40.0;python_version<"3.10"
grpcio-tools;python_version>="3.10"
grpcio-tools<=1.43.0,>=1.40.0;python_version<"3.10"
grpcio;python_version>="3.11"
grpcio<=1.43.0,>=1.40.0;python_version<"3.11"
grpcio-tools;python_version>="3.11"
grpcio-tools<=1.43.0,>=1.40.0;python_version<"3.11"
kubernetes~=12.0.1
protobuf;python_version>="3.10"
protobuf>=3.15.0,<=3.18.1;python_version<"3.10"
protobuf;python_version>="3.11"
protobuf>=3.15.0,<=3.18.1;python_version<"3.11"
PyYAML
vineyard>=0.11.1; sys_platform != "win32"
vineyard-io>=0.11.1; sys_platform != "win32"
Expand Down
14 changes: 7 additions & 7 deletions k8s/internal/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,10 @@ graphscope-client-manylinux2014-py3-nodocker:
cd $(WORKING_DIR)/../../python; \
export PATH=/opt/python/$$py/bin:$$PATH; \
pip3 install -U pip; \
if [ "$$py" == "cp37-cp37m" ] || [ "$$py" == "cp38-cp38" ] || [ "$$py" == "cp39-cp39" ]; then \
pip3 install "numpy==1.18.5" "pandas" "grpcio<=1.43.0,>=1.40.0" "grpcio-tools<=1.43.0,>=1.40.0" wheel "auditwheel==5.0.0"; \
else \
if [ "$$py" == "cp311-cp311" ]; then \
pip3 install "numpy" "pandas" "grpcio" "grpcio-tools" wheel "auditwheel==5.0.0"; \
else \
pip3 install "numpy==1.18.5" "pandas" "grpcio<=1.43.0,>=1.40.0" "grpcio-tools<=1.43.0,>=1.40.0" wheel "auditwheel==5.0.0"; \
fi; \
rm -rf build; \
rm -rf dist/*.whl; \
Expand All @@ -165,12 +165,12 @@ graphscope-client-darwin-py3:
make graphlearn_shared -j`nproc` && \
export DYLD_LIBRARY_PATH=$(WORKING_DIR)/../../learning_engine/graph-learn/graphlearn/built/lib:/usr/local/lib:$$DYLD_LIBRARY_PATH && \
cd $(WORKING_DIR)/../../python && \
py=$$(python3 -V 2>&1 | sed 's/.* \([0-9]\).\([0-9]\).*/\1\2/') && \
py=$$(python3 -V 2>&1 | awk '{print $$2}' | awk -F '.' '{print $$1$$2}') && \
pip3 install -U pip && \
if [ "$$py" == "37" ] || [ "$$py" == "38" ] || [ "$$py" == "39" ]; then \
pip3 install "numpy==1.18.5" "pandas" "grpcio<=1.43.0,>=1.40.0" "grpcio-tools<=1.43.0,>=1.40.0" delocate wheel; \
else \
if [ "$$py" == "311" ]; then \
pip3 install "numpy" "pandas" "grpcio" "grpcio-tools" delocate wheel; \
else \
pip3 install "numpy==1.18.5" "pandas" "grpcio<=1.43.0,>=1.40.0" "grpcio-tools<=1.43.0,>=1.40.0" delocate wheel; \
fi; \
rm -rf build dist/*.whl || true && \
python3 setup.py bdist_wheel --plat=macosx_10_9_x86_64 && \
Expand Down
12 changes: 6 additions & 6 deletions python/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Cython==3.0a6
gremlinpython>=3.4.9
grpcio;python_version>="3.10"
grpcio<=1.43.0,>=1.40.0;python_version<"3.10"
grpcio-tools;python_version>="3.10"
grpcio-tools<=1.43.0,>=1.40.0;python_version<"3.10"
grpcio;python_version>="3.11"
grpcio<=1.43.0,>=1.40.0;python_version<"3.11"
grpcio-tools;python_version>="3.11"
grpcio-tools<=1.43.0,>=1.40.0;python_version<"3.11"
kubernetes
msgpack
nest_asyncio
Expand All @@ -13,8 +13,8 @@ numpy
orjson
packaging
pandas
protobuf;python_version>="3.10"
protobuf>=3.15.0,<=3.18.1;python_version<"3.10"
protobuf;python_version>="3.11"
protobuf>=3.15.0,<=3.18.1;python_version<"3.11"
psutil
pyarrow;python_version>="3.11"
pyarrow<=6.0.0;python_version<"3.11"
Expand Down

0 comments on commit b95179b

Please sign in to comment.