Skip to content

Commit 966c10e

Browse files
can-anyscalecan-anyscale
authored
[ci] fix master (ray-project#42093)
Fix master, pushed by mistake Signed-off-by: can <[email protected]>
1 parent 01dc716 commit 966c10e

19 files changed

+79
-63
lines changed

‎.buildkite/_forge.aarch64.rayci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ steps:
1818
matrix:
1919
setup:
2020
python:
21+
- "3.8"
2122
- "3.9"
2223
- "3.10"
2324
- "3.11"
@@ -40,6 +41,7 @@ steps:
4041
- core_cpp
4142
wanda: ci/docker/ray.cpu.base.aarch64.wanda.yaml
4243
matrix:
44+
- "3.8"
4345
- "3.9"
4446
- "3.10"
4547
- "3.11"

‎.buildkite/_forge.rayci.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ steps:
1515
matrix:
1616
setup:
1717
python:
18+
- "3.8"
1819
- "3.9"
1920
- "3.10"
2021
- "3.11"
@@ -38,6 +39,7 @@ steps:
3839
- serve
3940
wanda: ci/docker/ray.cpu.base.wanda.yaml
4041
matrix:
42+
- "3.8"
4143
- "3.9"
4244
- "3.10"
4345
- "3.11"
@@ -54,6 +56,7 @@ steps:
5456
matrix:
5557
setup:
5658
python:
59+
- "3.8"
5760
- "3.9"
5861
- "3.10"
5962
cuda:
@@ -70,6 +73,7 @@ steps:
7073
wanda: ci/docker/ray-ml.cpu.base.wanda.yaml
7174
depends_on: raycpubase
7275
matrix:
76+
- "3.8"
7377
- "3.9"
7478
- "3.10"
7579
env:

‎.buildkite/build.rayci.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ steps:
88
commands:
99
- bazel run //ci/ray_ci:build_in_docker -- wheel --python-version {{matrix}} --architecture x86_64
1010
matrix:
11+
- "3.8"
1112
- "3.9"
1213
- "3.10"
1314
- "3.11"
@@ -23,6 +24,7 @@ steps:
2324
commands:
2425
- bazel run //ci/ray_ci:build_in_docker -- wheel --python-version {{matrix}} --architecture aarch64
2526
matrix:
27+
- "3.8"
2628
- "3.9"
2729
- "3.10"
2830
- "3.11"
@@ -37,7 +39,7 @@ steps:
3739
- oss
3840
instance_type: medium
3941
commands:
40-
- bazel run //ci/ray_ci:build_in_docker -- wheel --python-version 3.9 --build-type debug
42+
- bazel run //ci/ray_ci:build_in_docker -- wheel --python-version 3.8 --build-type debug
4143
depends_on:
4244
- manylinux
4345
- forge
@@ -55,6 +57,7 @@ steps:
5557
- export BUILD_ONE_PYTHON_ONLY={{matrix}}
5658
- bash /c/workdir/.buildkite/windows_ci.sh wheels
5759
matrix:
60+
- "3.8"
5861
- "3.9"
5962
- "3.10"
6063
- "3.11"
@@ -96,6 +99,7 @@ steps:
9699
- raycudabase
97100
- raycpubase
98101
matrix:
102+
- "3.8"
99103
- "3.9"
100104
- "3.10"
101105
- "3.11"
@@ -121,6 +125,7 @@ steps:
121125
- raycpubase-aarch64
122126
job_env: forge-aarch64
123127
matrix:
128+
- "3.8"
124129
- "3.9"
125130
- "3.10"
126131
- "3.11"
@@ -141,6 +146,7 @@ steps:
141146
- ray-mlcudabase
142147
- ray-mlcpubase
143148
matrix:
149+
- "3.8"
144150
- "3.9"
145151
- "3.10"
146152

‎.buildkite/core.rayci.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ steps:
1111
label: "wanda: minbuild-core-py{{matrix}}"
1212
wanda: ci/docker/min.build.wanda.yaml
1313
matrix:
14+
- "3.8"
1415
- "3.9"
1516
- "3.10"
1617
- "3.11"
@@ -220,6 +221,7 @@ steps:
220221
--only-tags minimal
221222
--skip-ray-installation
222223
matrix:
224+
- "3.8"
223225
- "3.9"
224226
- "3.10"
225227
- "3.11"
@@ -304,7 +306,7 @@ steps:
304306
- docker
305307
instance_type: medium
306308
commands:
307-
- bazel run //ci/ray_ci:build_in_docker -- docker --python-version 3.9 --platform cpu --canonical-tag ha_integration
309+
- bazel run //ci/ray_ci:build_in_docker -- docker --python-version 3.8 --platform cpu --canonical-tag ha_integration
308310
- bazel run //ci/ray_ci:test_in_docker -- //python/ray/tests/... core --only-tags ha_integration
309311
depends_on:
310312
- manylinux
@@ -318,7 +320,7 @@ steps:
318320
- docker
319321
instance_type: medium
320322
commands:
321-
- bazel run //ci/ray_ci:build_in_docker -- docker --python-version 3.9 --platform cpu
323+
- bazel run //ci/ray_ci:build_in_docker -- docker --python-version 3.8 --platform cpu
322324
--canonical-tag test_container
323325
- docker build --build-arg BASE_IMAGE="rayproject/ray:test_container"
324326
-t rayproject/ray:runtime_env_container -f docker/runtime_env_container/Dockerfile .

‎.buildkite/ml.rayci.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ group: ml tests
22
steps:
33
# builds
44
- name: minbuild-ml
5-
label: "wanda: minbuild-ml-py39"
5+
label: "wanda: minbuild-ml-py38"
66
wanda: ci/docker/min.build.wanda.yaml
77
depends_on: oss-ci-base_build
88
env:
9-
PYTHON_VERSION: "3.9"
9+
PYTHON_VERSION: "3.8"
1010
EXTRA_DEPENDENCY: ml
1111

1212
- name: mlbuild
@@ -159,21 +159,21 @@ steps:
159159
- python ./ci/env/check_minimal_install.py
160160
- bazel run //ci/ray_ci:test_in_docker -- //python/ray/train/... ml
161161
--parallelism-per-worker 2
162-
--build-name minbuild-ml-py3.9
162+
--build-name minbuild-ml-py3.8
163163
--only-tags minimal
164164
depends_on: [ "minbuild-ml", "forge" ]
165165

166166
- label: ":train: ml: tune multinode tests"
167167
tags: tune
168168
instance_type: medium
169169
commands:
170-
- bazel run //ci/ray_ci:build_in_docker -- docker --python-version 3.9
171-
--platform cpu --image-type ray --canonical-tag multinode-py39
172-
- python ./ci/build/build-multinode-image.py rayproject/ray:multinode-py38 rayproject/ray:multinode-py39
170+
- bazel run //ci/ray_ci:build_in_docker -- docker --python-version 3.8
171+
--platform cpu --image-type ray --canonical-tag multinode-py38
172+
- python ./ci/build/build-multinode-image.py rayproject/ray:multinode-py38 rayproject/ray:multinode-py38
173173
- bazel run //ci/ray_ci:test_in_docker -- //python/ray/tune/... ml
174174
--only-tags multinode
175175
--test-env=RAY_HAS_SSH=1
176-
--test-env=RAY_DOCKER_IMAGE=rayproject/ray:multinode-py39
176+
--test-env=RAY_DOCKER_IMAGE=rayproject/ray:multinode-py38
177177
--test-env=RAY_TEMPDIR="/ray-mount"
178178
--test-env=RAY_HOSTDIR="$${RAYCI_CHECKOUT_DIR}"
179179
--test-env=RAY_TESTHOST="rayci.localhost"

‎.buildkite/pipeline.macos.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ common: &common
44
env:
55
BUILDKITE: "true"
66
CI: "true"
7-
PYTHON: "3.9"
7+
PYTHON: "3.8"
88
RAY_USE_RANDOM_PORTS: "1"
99
RAY_DEFAULT_BUILD: "1"
1010
LC_ALL: en_US.UTF-8
@@ -92,7 +92,7 @@ steps:
9292
- export MAC_JARS=1
9393
- export RAY_INSTALL_JAVA=1
9494
- export RAY_ENABLE_WINDOWS_OR_OSX_CLUSTER=1
95-
- export PYTHON=3.9
95+
- export PYTHON=3.8
9696
- . ./ci/ci.sh init && source ~/.zshenv
9797
- ./ci/ci.sh build
9898
# Test wheels

‎.buildkite/release/build.rayci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ steps:
1515
python:
1616
# This list should be kept in sync with the list of supported Python in
1717
# release test suite. We don't have release tests for Python 3.10 yet.
18+
- "3.8"
1819
- "3.9"
1920
- "3.11"
2021
platform:
@@ -33,4 +34,5 @@ steps:
3334
# This list should be kept in sync with the list of supported Python in
3435
# release test suite. We don't have ray-ml release tests for Python 3.10 and 3.11
3536
# yet.
37+
- "3.8"
3638
- "3.9"

‎.buildkite/serve.rayci.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ steps:
1414
wanda: ci/docker/servepython311.build.wanda.yaml
1515

1616
- name: minbuild-serve
17-
label: "wanda: minbuild-{{matrix}}-py39"
17+
label: "wanda: minbuild-{{matrix}}-py38"
1818
wanda: ci/docker/min.build.wanda.yaml
1919
matrix:
2020
- serve
2121
- default
2222
env:
23-
PYTHON_VERSION: "3.9"
23+
PYTHON_VERSION: "3.8"
2424
EXTRA_DEPENDENCY: "{{matrix}}"
2525

2626
# tests
@@ -34,7 +34,7 @@ steps:
3434
- bazel run //ci/ray_ci:test_in_docker -- //python/ray/serve/... //python/ray/tests/... serve
3535
--except-tags post_wheel_build,gpu,worker-container,ha_integration
3636
--workers "$${BUILDKITE_PARALLEL_JOB_COUNT}" --worker-id "$${BUILDKITE_PARALLEL_JOB}" --parallelism-per-worker 3
37-
--build-name servebuild --test-env=EXPECTED_PYTHON_VERSION=3.9
37+
--build-name servebuild --test-env=EXPECTED_PYTHON_VERSION=3.8
3838
depends_on: "servebuild"
3939

4040
- label: ":ray-serve: serve: pydantic < 2.0 tests"
@@ -48,7 +48,7 @@ steps:
4848
- bazel run //ci/ray_ci:test_in_docker -- //python/ray/serve/... //python/ray/tests/... serve
4949
--except-tags post_wheel_build,gpu,worker-container,ha_integration
5050
--workers "$${BUILDKITE_PARALLEL_JOB_COUNT}" --worker-id "$${BUILDKITE_PARALLEL_JOB}" --parallelism-per-worker 3
51-
--build-name servepydantic1build --test-env=EXPECTED_PYTHON_VERSION=3.9 --test-env=EXPECTED_PYDANTIC_VERSION=1.10.12
51+
--build-name servepydantic1build --test-env=EXPECTED_PYTHON_VERSION=3.8 --test-env=EXPECTED_PYDANTIC_VERSION=1.10.12
5252
depends_on: servepydantic1build
5353

5454
- label: ":ray-serve: serve: Python 3.11 tests"
@@ -146,7 +146,7 @@ steps:
146146
commands:
147147
- bazel run //ci/ray_ci:test_in_docker -- //python/ray/dashboard/... serve
148148
--parallelism-per-worker 2
149-
--build-name minbuild-default-py3.9
149+
--build-name minbuild-default-py3.8
150150
--test-env=RAY_DEFAULT=1
151151
--only-tags minimal
152152
depends_on: minbuild-serve
@@ -159,7 +159,7 @@ steps:
159159
commands:
160160
- bazel run //ci/ray_ci:test_in_docker -- //python/ray/serve/tests/... serve
161161
--parallelism-per-worker 2
162-
--build-name minbuild-serve-py3.9
162+
--build-name minbuild-serve-py3.8
163163
--test-env=RAY_DEFAULT=1
164164
--only-tags minimal
165165
depends_on: minbuild-serve
@@ -181,7 +181,7 @@ steps:
181181
- python
182182
instance_type: medium
183183
commands:
184-
- bazel run //ci/ray_ci:build_in_docker -- docker --python-version 3.9 --platform cpu --canonical-tag ha_integration
184+
- bazel run //ci/ray_ci:build_in_docker -- docker --python-version 3.8 --platform cpu --canonical-tag ha_integration
185185
- bazel run //ci/ray_ci:test_in_docker -- //python/ray/serve/tests/... serve
186186
--only-tags ha_integration
187187
depends_on:

‎.buildkite/windows_ci.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ cd ray
1212

1313
git checkout -f "${BUILDKITE_COMMIT}"
1414

15-
export PYTHON="3.9"
15+
export PYTHON="3.8"
1616
export RAY_USE_RANDOM_PORTS="1"
1717
export RAY_DEFAULT_BUILD="1"
1818
export LC_ALL="en_US.UTF-8"

‎ci/docker/base.gpu.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ARG REMOTE_CACHE_URL
44
ARG BUILDKITE_PULL_REQUEST
55
ARG BUILDKITE_COMMIT
66
ARG BUILDKITE_PULL_REQUEST_BASE_BRANCH
7-
ARG PYTHON=3.9
7+
ARG PYTHON=3.8
88

99
ENV DEBIAN_FRONTEND=noninteractive
1010
ENV TZ=America/Los_Angeles

‎ci/docker/base.test.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
FROM ubuntu:focal
44

55
ARG BUILDKITE_BAZEL_CACHE_URL
6-
ARG PYTHON=3.9
6+
ARG PYTHON=3.8
77

88
ENV DEBIAN_FRONTEND=noninteractive
99
ENV TZ=America/Los_Angeles

‎ci/env/install-dependencies.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ install_miniconda() {
7979

8080
if [ ! -x "${conda}" ] || [ "${MINIMAL_INSTALL-}" = 1 ]; then # If no conda is found, install it
8181
local miniconda_dir # Keep directories user-independent, to help with Bazel caching
82-
local miniconda_version="Miniconda3-py39_23.11.0-2"
82+
local miniconda_version="Miniconda3-py38_23.1.0-1"
8383
local miniconda_platform=""
8484
local exe_suffix=".sh"
8585

‎ci/ray_ci/builder.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
)
3535
@click.option(
3636
"--python-version",
37-
default="3.9",
37+
default="3.8",
3838
type=click.Choice(list(PYTHON_VERSIONS.keys())),
3939
help=("Python version to build the wheel with"),
4040
)

‎ci/ray_ci/builder_container.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,12 @@ class PythonVersionInfo(TypedDict):
1818
"aarch64",
1919
]
2020
PYTHON_VERSIONS = {
21+
"3.8": PythonVersionInfo(bin_path="cp38-cp38", numpy_version="1.19.3"),
2122
"3.9": PythonVersionInfo(bin_path="cp39-cp39", numpy_version="1.19.3"),
2223
"3.10": PythonVersionInfo(bin_path="cp310-cp310", numpy_version="1.22.0"),
2324
"3.11": PythonVersionInfo(bin_path="cp311-cp311", numpy_version="1.22.0"),
2425
}
25-
DEFAULT_PYTHON_VERSION = "3.9"
26+
DEFAULT_PYTHON_VERSION = "3.8"
2627
DEFAULT_BUILD_TYPE = "optimized"
2728
DEFAULT_ARCHITECTURE = "x86_64"
2829

‎ci/ray_ci/docker_container.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"cu12.1.1",
1515
]
1616
GPU_PLATFORM = "cu11.8.0"
17-
DEFAULT_PYTHON_VERSION = "3.9"
17+
DEFAULT_PYTHON_VERSION = "3.8"
1818

1919

2020
class DockerContainer(LinuxContainer):
@@ -73,7 +73,7 @@ def _get_canonical_tag(self) -> str:
7373
return self.canonical_tag if self.canonical_tag else self._get_image_tags()[0]
7474

7575
def get_python_version_tag(self) -> str:
76-
return f"-py{self.python_version.replace('.', '')}" # 3.9 -> py39
76+
return f"-py{self.python_version.replace('.', '')}" # 3.8 -> py38
7777

7878
def get_platform_tag(self) -> str:
7979
if self.platform == "cpu":

0 commit comments

Comments
 (0)