Skip to content

Commit

Permalink
Fix: make ci happy with python3.10 x ubuntu-22.04. (#212)
Browse files Browse the repository at this point in the history
* Fix: make ci happy with python3.10 x ubuntu-22.04.

* Fix a ut.

* Revert setuptools for compatibility with ray dashboard.
  • Loading branch information
zhouaihui authored Aug 28, 2024
1 parent 3a7c592 commit 7b1b594
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 18 deletions.
8 changes: 5 additions & 3 deletions .github/workflows/building-wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ on:
jobs:
build-wheels:
timeout-minutes: 60
runs-on: ubuntu-latest
container: docker.io/library/ubuntu:latest
runs-on: ubuntu-22.04
container: docker.io/library/ubuntu:22.04

steps:
- uses: actions/checkout@v2

- name: Install bazel
run: |
apt-get update
apt-get install -yq wget gcc g++ python3.9 zlib1g-dev zip libuv1.dev
apt-get install -yq wget gcc g++ python3.10 zlib1g-dev zip libuv1.dev
apt-get install -yq pip
- name: Install dependencies
Expand All @@ -27,6 +27,8 @@ jobs:
python3 -m virtualenv -p python3 py3
. py3/bin/activate
which python
# Revert setuptools for compatibility with ray dashboard.
pip install setuptools==69.5.1
pip install pytest torch cloudpickle cryptography
pip install ray==2.0.0
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ on:
jobs:
lint:
timeout-minutes: 10 # Lint should be done in 10 minutes.
runs-on: ubuntu-latest
container: docker.io/library/ubuntu:latest
runs-on: ubuntu-22.04
container: docker.io/library/ubuntu:22.04

steps:
- uses: actions/checkout@v2

- name: Install bazel
run: |
apt-get update
apt-get install -yq wget gcc g++ python3.9 zlib1g-dev zip libuv1.dev
apt-get install -yq wget gcc g++ python3.10 zlib1g-dev zip libuv1.dev
apt-get install -yq pip
- name: Install dependencies
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pypi-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Set up Python 3.9
- name: Set up Python 3.10
uses: actions/setup-python@v1
with:
python-version: 3.9
python-version: 3.10

- name: days since the commit date
run: |
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/test_on_ray1.13.0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ on:
jobs:
run-unit-tests:
timeout-minutes: 60
runs-on: ubuntu-latest
container: docker.io/library/ubuntu:latest
runs-on: ubuntu-22.04
container: docker.io/library/ubuntu:22.04

steps:
- uses: actions/checkout@v2

- name: Install bazel
run: |
apt-get update
apt-get install -yq wget gcc g++ python3.9 zlib1g-dev zip libuv1.dev
apt-get install -yq wget gcc g++ python3.10 zlib1g-dev zip libuv1.dev
apt-get install -yq pip
- name: Install dependencies
Expand All @@ -27,6 +27,8 @@ jobs:
python3 -m virtualenv -p python3 py3
. py3/bin/activate
which python
# Revert setuptools for compatibility with ray dashboard.
pip install setuptools==69.5.1
pip install pytest torch cloudpickle cryptography
pip install ray==1.13.0
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/unit_tests_for_protobuf_matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@ jobs:
protobuf_ver: ["3.19", "3.20", "4.23"]

timeout-minutes: 60
runs-on: ubuntu-latest
container: docker.io/library/ubuntu:latest
runs-on: ubuntu-22.04
container: docker.io/library/ubuntu:22.04

steps:
- uses: actions/checkout@v2

- name: Install basic dependencies
run: |
apt-get update
apt-get install -yq wget gcc g++ python3.9 zlib1g-dev zip libuv1.dev
apt-get install -yq wget gcc g++ python3.10 zlib1g-dev zip libuv1.dev
apt-get install -yq pip
- name: Install python dependencies
Expand All @@ -31,6 +31,8 @@ jobs:
python3 -m virtualenv -p python3 py3
. py3/bin/activate
which python
# Revert setuptools for compatibility with ray dashboard.
pip install setuptools==69.5.1
pip install pytest torch cloudpickle cryptography numpy
pip install protobuf==${{ matrix.protobuf_ver }}
pip install ray==2.4.0
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/unit_tests_on_ray_matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@ jobs:
ray_version: [2.4.0, 2.5.1, 2.6.3, 2.7.1, 2.8.1, 2.9.0]

timeout-minutes: 60
runs-on: ubuntu-latest
container: docker.io/library/ubuntu:latest
runs-on: ubuntu-22.04
container: docker.io/library/ubuntu:22.04

steps:
- uses: actions/checkout@v2

- name: Install basic dependencies
run: |
apt-get update
apt-get install -yq wget gcc g++ python3.9 zlib1g-dev zip libuv1.dev
apt-get install -yq wget gcc g++ python3.10 zlib1g-dev zip libuv1.dev
apt-get install -yq pip
- name: Install python dependencies
Expand All @@ -32,6 +32,8 @@ jobs:
python3 -m virtualenv -p python3 py3
. py3/bin/activate
which python
# Revert setuptools for compatibility with ray dashboard.
pip install setuptools==69.5.1
pip install pytest
pip install -r dev-requirements.txt
pip install ray==${{ matrix.ray_version }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def run(party):
'bob': '127.0.0.1:11356',
}
allowed_list = {
"numpy.core.numeric": ["*"],
"numpy._core.numeric": ["*"],
"numpy": ["dtype"],
}
fed.init(
Expand Down

0 comments on commit 7b1b594

Please sign in to comment.