Skip to content

Commit 71ca0c8

Browse files
luweizhengluweizheng
committed
update ci and deps
1 parent d458b8b commit 71ca0c8

File tree

3 files changed

+38
-28
lines changed

3 files changed

+38
-28
lines changed

‎.github/workflows/python.yaml‎

Lines changed: 29 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ name: Python CI
33
on:
44
push:
55
branches:
6-
- '*'
7-
pull_request:
8-
types: ['opened', 'reopened', 'synchronize']
6+
- '**'
7+
# pull_request:
8+
# types: ['opened', 'reopened', 'synchronize']
99

1010
concurrency:
1111
group: ${{ github.workflow }}-${{ github.ref }}
@@ -75,25 +75,25 @@ jobs:
7575
strategy:
7676
fail-fast: false
7777
matrix:
78-
os: ["ubuntu-latest", "macos-14", "windows-latest"]
79-
python-version: ["3.9", "3.10", "3.11", "3.12"]
78+
# os: ["ubuntu-latest", "macos-14", "windows-latest"]
79+
# python-version: ["3.9", "3.10", "3.11", "3.12"]
8080
module: ["xorbits"]
8181
exclude:
8282
- { os: macos-14, python-version: 3.10}
8383
- { os: macos-14, python-version: 3.9}
8484
- { os: windows-latest, python-version: 3.10}
8585
- { os: windows-latest, python-version: 3.9}
8686
include:
87-
- { os: ubuntu-latest, module: _mars/dataframe, python-version: "3.11" }
88-
- { os: ubuntu-latest, module: learn, python-version: "3.11" }
89-
- { os: ubuntu-latest, module: mars-core, python-version: "3.11" }
90-
- { os: ubuntu-20.04, module: hadoop, python-version: "3.10" }
91-
- { os: ubuntu-latest, module: vineyard, python-version: "3.11" }
87+
# - { os: ubuntu-latest, module: _mars/dataframe, python-version: "3.11" }
88+
# - { os: ubuntu-latest, module: learn, python-version: "3.11" }
89+
# - { os: ubuntu-latest, module: mars-core, python-version: "3.11" }
90+
# - { os: ubuntu-20.04, module: hadoop, python-version: "3.10" }
91+
# - { os: ubuntu-latest, module: vineyard, python-version: "3.11" }
92+
# - { os: ubuntu-latest, module: doc-build, python-version: "3.11" }
93+
# - { os: self-hosted, module: gpu, python-version: "3.11" }
94+
# - { os: ubuntu-latest, module: jax, python-version: "3.10" }
95+
# - { os: ubuntu-latest, module: datasets, python-version: "3.10" }
9296
- { os: ubuntu-latest, module: external-storage, python-version: "3.11" }
93-
- { os: ubuntu-latest, module: doc-build, python-version: "3.11" }
94-
- { os: self-hosted, module: gpu, python-version: "3.11" }
95-
- { os: ubuntu-latest, module: jax, python-version: "3.10" }
96-
- { os: ubuntu-latest, module: datasets, python-version: "3.10" }
9797
# a self-hosted runner which needs computing resources, activate when necessary
9898
# - { os: juicefs-ci, module: kubernetes-juicefs, python-version: 3.9 }
9999
# TODO: slurm & kubernetes tests are not stable
@@ -204,22 +204,30 @@ jobs:
204204
rm -fr /tmp/etcd-$ETCD_VER-linux-amd64.tar.gz /tmp/etcd-download-test
205205
fi
206206
if [[ "$MODULE" == "external-storage" ]]; then
207+
# install Java 11
208+
sudo apt-get update
209+
sudo apt-get install -y openjdk-11-jdk
210+
sudo update-alternatives --set java /usr/lib/jvm/java-11-openjdk-amd64/bin/java
211+
212+
# install Alluxio
207213
export CUR_DIR=$(pwd)
208214
mkdir -p /tmp/alluxio-download-test
209215
cd /tmp/alluxio-download-test
210-
wget -q https://downloads.alluxio.io/downloads/files/2.9.3/alluxio-2.9.3-bin.tar.gz
211-
tar -xzf alluxio-2.9.3-bin.tar.gz
212-
cd alluxio-2.9.3
216+
wget -q https://downloads.alluxio.io/downloads/files/2.9.5/alluxio-2.9.5-bin.tar.gz
217+
tar -xzf alluxio-2.9.5-bin.tar.gz
218+
cd alluxio-2.9.5
213219
cp conf/alluxio-env.sh.template conf/alluxio-env.sh
214220
cp conf/alluxio-site.properties.template conf/alluxio-site.properties
215221
echo "alluxio.master.hostname=localhost" >> conf/alluxio-site.properties
216222
cd $CUR_DIR
217-
sudo mv /tmp/alluxio-download-test/alluxio-2.9.3 /usr/local/bin/
223+
sudo mv /tmp/alluxio-download-test/alluxio-2.9.5 /usr/local/bin/
218224
rm -R /tmp/alluxio-download-test
219225
unset CUR_DIR
220-
export ALLUXIO_HOME="/usr/local/bin/alluxio-2.9.3"
226+
export ALLUXIO_HOME="/usr/local/bin/alluxio-2.9.5"
221227
${ALLUXIO_HOME}/bin/alluxio format
222228
${ALLUXIO_HOME}/bin/alluxio-start.sh local SudoMount
229+
230+
# install JuiceFS
223231
curl -sSL https://d.juicefs.com/install | sh -
224232
curl -fsSL https://packages.redis.io/gpg | sudo gpg --dearmor -o /usr/share/keyrings/redis-archive-keyring.gpg
225233
echo "deb [signed-by=/usr/share/keyrings/redis-archive-keyring.gpg] https://packages.redis.io/deb $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/redis.list
@@ -359,7 +367,7 @@ jobs:
359367
xorbits/_mars/tensor/datastore/tests/test_datastore_execution.py \
360368
xorbits/_mars/dataframe/datastore/tests/test_datastore_execution.py
361369
elif [[ "$MODULE" == "external-storage" ]]; then
362-
export ALLUXIO_HOME="/usr/local/bin/alluxio-2.9.3"
370+
export ALLUXIO_HOME="/usr/local/bin/alluxio-2.9.5"
363371
export JUICEFS_HOME="/usr/local/bin/juicefs"
364372
pytest --timeout=1500 -W ignore::PendingDeprecationWarning \
365373
--cov-config=setup.cfg --cov-report=xml --cov=xorbits xorbits/_mars/storage/tests/test_libs.py
@@ -372,7 +380,7 @@ jobs:
372380
pytest --timeout=1500 \
373381
-W ignore::PendingDeprecationWarning \
374382
--cov-config=setup.cfg --cov-report=xml --cov=xorbits \
375-
xorbits/xgboost xorbits/lightgbm
383+
xorbits/_mars/learn/contrib/xgboost/ xorbits/_mars/learn/contrib/lightgbm/
376384
elif [ "$MODULE" == "jax" ]; then
377385
pytest --cov-config=setup.cfg --cov-report=xml --cov=xorbits xorbits/_mars/tensor/fuse/tests/test_runtime_fusion.py
378386
pytest --cov-config=setup.cfg --cov-report=xml --cov=xorbits xorbits/_mars/tensor/

‎CI/requirements-wheel.txt‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
oldest-supported-numpy
2-
31
pandas==1.2.2; python_version>='3.9' and python_version<'3.10' and platform_machine!='arm64'
42
pandas==1.4.0; python_version>='3.9' and python_version<'3.10' and platform_machine=='arm64'
53
pandas==1.3.4; python_version>='3.10' and python_version<'3.11' and platform_machine!='arm64'
64
pandas==1.4.0; python_version>='3.10' and python_version<'3.11' and platform_machine=='arm64'
75
pandas==1.5.1; python_version>='3.11' and python_version<'3.12'
8-
pandas>=2.1.1; python_version>='3.12'
6+
pandas==1.5.1; python_version>='3.11' and python_version<'3.12'
7+
pandas==2.1.1; python_version>='3.12' and python_version<'3.13'
8+
pandas>=2.2.3; python_version>='3.13'
99

1010
packaging
1111
numpy
@@ -17,7 +17,8 @@ scipy==1.7.3; python_version>='3.9' and python_version<'3.10' and platform_machi
1717
scipy==1.7.2; python_version>='3.10' and python_version<'3.11' and platform_machine!='arm64'
1818
scipy==1.7.3; python_version>='3.10' and python_version<'3.11' and platform_machine=='arm64'
1919
scipy==1.9.2; python_version>='3.11' and python_version<'3.12'
20-
scipy>=1.11.2; python_version>='3.12'
20+
scipy>=1.11.2; python_version>='3.12' and python_version<'3.13'
21+
scipy>=1.14.1; python_version>='3.13'
2122

2223
# see: https://github.com/cython/cython/commit/afc00fc3ba5d43c67151c0039847a526e7b627a5
2324
cython>=0.29.33

‎python/pyproject.toml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,21 @@ requires = [
44
"setuptools; python_version>='3.12'",
55
"packaging",
66
"wheel",
7-
"oldest-supported-numpy",
87
"numpy",
98
"pandas==1.2.2; python_version>='3.9' and python_version<'3.10' and platform_machine!='arm64'",
109
"pandas==1.4.0; python_version>='3.9' and python_version<'3.10' and platform_machine=='arm64'",
1110
"pandas==1.3.4; python_version>='3.10' and python_version<'3.11' and platform_machine!='arm64'",
1211
"pandas==1.4.0; python_version>='3.10' and python_version<'3.11' and platform_machine=='arm64'",
1312
"pandas==1.5.1; python_version>='3.11' and python_version<'3.12'",
14-
"pandas>=2.1.1; python_version>='3.12'",
13+
"pandas>=2.1.1; python_version>='3.12' and python_version<'3.13'",
14+
"pandas>=2.1.3; python_version>='3.13'",
1515
"scipy==1.5.4; python_version>='3.9' and python_version<'3.10' and platform_machine!='arm64'",
1616
"scipy==1.7.3; python_version>='3.9' and python_version<'3.10' and platform_machine=='arm64'",
1717
"scipy==1.7.2; python_version>='3.10' and python_version<'3.11' and platform_machine!='arm64'",
1818
"scipy==1.7.3; python_version>='3.10' and python_version<'3.11' and platform_machine=='arm64'",
1919
"scipy==1.9.2; python_version>='3.11' and python_version<'3.12'",
20-
"scipy>=1.11.2; python_version>='3.12'",
20+
"scipy>=1.11.2; python_version>='3.12' and python_version<'3.13'",
21+
"scipy>=1.14.1; python_version>='3.13'",
2122
"cython>=0.29.33",
2223
"requests>=2.4.0",
2324
"cloudpickle>=2.2.1; python_version>='3.11'",

0 commit comments

Comments
 (0)