From 1853c80f964a884498b5d193e4438d2b9b486e93 Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Wed, 11 Oct 2023 18:32:23 +0200 Subject: [PATCH 1/6] Trigger CI From 61dac73c21d77fea50fc368f9858496e895e4291 Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Thu, 12 Oct 2023 14:19:34 +0200 Subject: [PATCH 2/6] Trigger CI From 47430cefa10f9b5a5741b5f3bff95aef09e5939d Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Thu, 12 Oct 2023 14:26:26 +0200 Subject: [PATCH 3/6] Update ray installation to use the 3.0.0.dev0 nightly wheel to install the dev dependencies --- .github/workflows/testing.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 9fff483f..7da26339 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -184,7 +184,7 @@ jobs: PROJECT: ray strategy: matrix: - python_version: ["3.10"] + python_version: ["3.11"] steps: - uses: actions/checkout@v1 - name: Set up Python @@ -196,7 +196,7 @@ jobs: python -m pip install --upgrade -r dev-requirements.txt python -m pip install setproctitle psutil # from https://docs.ray.io/en/master/development.html#building-ray - pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-2.0.0.dev0-cp310-cp310-manylinux2014_x86_64.whl + pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp311-cp311-manylinux2014_x86_64.whl pushd .. git clone https://github.com/ray-project/ray.git pushd ray From ee90034e82e8e6b78dd8062f65fb964e15a9437d Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Thu, 12 Oct 2023 14:30:31 +0200 Subject: [PATCH 4/6] Skip test_decide_worker_coschedule_order_neighbors for distributed downstream CI --- .github/workflows/testing.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 7da26339..9dac8c60 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -119,7 +119,9 @@ jobs: # FIXME ipv6-related failures on Ubuntu github actions CI # https://github.com/dask/distributed/issues/4514 export DISABLE_IPV6=1 - export PYTEST_ADDOPTS=("-m" "not avoid_ci") + # test_decide_worker_coschedule_order_neighbors is skipped because of: + # https://github.com/dask/distributed/issues/8255 + export PYTEST_ADDOPTS=("-m" "not avoid_ci", -k "not test_decide_worker_coschedule_order_neighbors") source ./.github/scripts/test_downstream_project.sh joblib-downstream-build: From 68e0ac855992fc359580aa7050b073c472d7939f Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Thu, 12 Oct 2023 15:16:43 +0200 Subject: [PATCH 5/6] Update Ray CI config --- .github/workflows/testing.yml | 44 +++++++++++++++++------------------ 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 9dac8c60..fd65417e 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -193,29 +193,29 @@ jobs: uses: actions/setup-python@v1 with: python-version: ${{ matrix.python_version }} - - name: Install project and dependencies + - name: Install project and tests dependencies + run: | + python -m pip install --upgrade -r dev-requirements.txt setproctitle psutil catboost \ + https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp311-cp311-manylinux2014_x86_64.whl + - name: Test cloudpickle itself + run: | + COVERAGE_PROCESS_START="$TRAVIS_BUILD_DIR/.coveragerc" PYTHONPATH='.:tests' pytest -r s + - name: Patch Ray with the development version of cloudpickle + run: | + RAY_PACKAGE_DIR=$(python -c "import os, ray; print(os.path.dirname(ray.__file__), flush=True)") + cp cloudpickle/cloudpickle.py $RAY_PACKAGE_DIR/cloudpickle/cloudpickle.py + cp cloudpickle/compat.py $RAY_PACKAGE_DIR/cloudpickle/compat.py + cp cloudpickle/cloudpickle_fast.py $RAY_PACKAGE_DIR/cloudpickle/cloudpickle_fast.py + - name: Fetch the Ray test suite from github run: | - python -m pip install --upgrade -r dev-requirements.txt - python -m pip install setproctitle psutil - # from https://docs.ray.io/en/master/development.html#building-ray - pip install -U https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-3.0.0.dev0-cp311-cp311-manylinux2014_x86_64.whl pushd .. git clone https://github.com/ray-project/ray.git - pushd ray - python python/ray/setup-dev.py --yes popd - popd - PROJECT_DIR=$(python -c "import os, ray; print(os.path.dirname(ray.__file__), flush=True)") - rm $PROJECT_DIR/cloudpickle/cloudpickle.py - cp cloudpickle/cloudpickle.py $PROJECT_DIR/cloudpickle/cloudpickle.py - cp cloudpickle/compat.py $PROJECT_DIR/cloudpickle/compat.py - cp cloudpickle/cloudpickle_fast.py $PROJECT_DIR/cloudpickle/cloudpickle_fast.py - - name: Test the downstream project - run: | - PROJECT_DIR="$(python -c "import os, ray; print(os.path.dirname(ray.__file__), flush=True)")" - COVERAGE_PROCESS_START="$TRAVIS_BUILD_DIR/.coveragerc" PYTHONPATH='.:tests' pytest -r s - pytest -vl $PROJECT_DIR/tests/test_serialization.py::test_simple_serialization - pytest -vl $PROJECT_DIR/tests/test_serialization.py::test_complex_serialization - pytest -vl $PROJECT_DIR/tests/test_basic.py::test_ray_recursive_objects - pytest -vl $PROJECT_DIR/tests/test_serialization.py::test_serialization_final_fallback - pytest -vl $PROJECT_DIR/tests/test_basic.py::test_nested_functions + - name: Run some tests from Ray's test suite + run: | + pushd ../ray/python/ray/tests + pytest -vl test_serialization.py::test_simple_serialization + pytest -vl test_serialization.py::test_complex_serialization + pytest -vl test_basic.py::test_ray_recursive_objects + pytest -vl test_serialization.py::test_serialization_final_fallback + pytest -vl test_basic.py::test_nested_functions From ac976c510961b8c108c43cd00db0fb39e89bc00b Mon Sep 17 00:00:00 2001 From: Olivier Grisel Date: Thu, 12 Oct 2023 15:18:23 +0200 Subject: [PATCH 6/6] Typo in distributed CI config --- .github/workflows/testing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index fd65417e..eeedf68f 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -121,7 +121,7 @@ jobs: export DISABLE_IPV6=1 # test_decide_worker_coschedule_order_neighbors is skipped because of: # https://github.com/dask/distributed/issues/8255 - export PYTEST_ADDOPTS=("-m" "not avoid_ci", -k "not test_decide_worker_coschedule_order_neighbors") + export PYTEST_ADDOPTS=("-m" "not avoid_ci" "-k" "not test_decide_worker_coschedule_order_neighbors") source ./.github/scripts/test_downstream_project.sh joblib-downstream-build: