Skip to content

Commit

Permalink
Make more tests run on Windows (ray-project#8553)
Browse files Browse the repository at this point in the history
  • Loading branch information
mehrdadn authored May 26, 2020
1 parent 137519e commit 79a4eac
Show file tree
Hide file tree
Showing 5 changed files with 77 additions and 62 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,15 @@ jobs:
include:
- name: ubuntu
os: ubuntu-16.04
python-version: 3.6
- name: windows
os: windows-2019
python-version: 3.8
- name: macos
os: macos-10.15
python-version: 3.6
env:
PYTHON: 3.6
PYTHON: ${{ matrix.python-version }}
TRAVIS_BUILD_DIR: ${{ github.workspace }}
TRAVIS_COMMIT: ${{ github.sha }}
#TRAVIS_PULL_REQUEST is defined in the scripts to account for "false"
Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ if [ "$RAY_BUILD_PYTHON" == "YES" ]; then
TEMP_DIR="$(mktemp -d)"
pushd "$TEMP_DIR"
curl -f -s -L -R -o "pickle5-backport.zip" "https://github.com/pitrou/pickle5-backport/archive/c0c1a158f59366696161e0dffdd10cfe17601372.zip"
unzip pickle5-backport.zip
unzip -q pickle5-backport.zip
pushd pickle5-backport-c0c1a158f59366696161e0dffdd10cfe17601372
CC=gcc "$PYTHON_EXECUTABLE" setup.py --quiet bdist_wheel
unzip -q -o dist/*.whl -d "$pickle5_path"
Expand Down
11 changes: 8 additions & 3 deletions ci/travis/ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,13 @@ upload_wheels() {

test_python() {
if [ "${OSTYPE}" = msys ]; then
# Windows -- most tests won't work yet; just do the ones we know work
PYTHONPATH=python python -m pytest --durations=5 --timeout=300 python/ray/tests/test_mini.py
# Increased timeout from default of timeout=300 due to test_basic
bazel test -k --config=ci --test_timeout=600 --build_tests_only -- \
python/ray/tests:test_actor \
python/ray/tests:test_basic \
python/ray/tests:test_debug_tools \
python/ray/tests:test_mini \
;
fi
}

Expand Down Expand Up @@ -190,7 +195,7 @@ install_ray() {
(
cd "${WORKSPACE_DIR}"/python
build_dashboard_front_end
keep_alive pip install -e .
pip install -v -e .
)
}

Expand Down
1 change: 0 additions & 1 deletion ci/travis/install-bazel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ if [ "${TRAVIS-}" = true ] || [ -n "${GITHUB_WORKFLOW-}" ]; then
build --color=yes
build --curses=no
build --disk_cache="$(test "${OSTYPE}" = msys || echo ~/ray-bazel-cache)"
build --progress_report_interval=60
# Use ray google cloud cache
build --remote_cache="https://storage.googleapis.com/ray-bazel-cache"
build --show_progress_rate_limit=15
Expand Down
Loading

0 comments on commit 79a4eac

Please sign in to comment.