From 1c4f80544f4d85a2e8db0a4ddd2fe7ba049027f8 Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Thu, 31 Jan 2019 14:19:29 -0800 Subject: [PATCH 01/89] Add ray to travis tests --- .travis.yml | 88 ++++++++++++++++++++++++++++------------------------- 1 file changed, 46 insertions(+), 42 deletions(-) diff --git a/.travis.yml b/.travis.yml index bdd338040..d6287eddd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,50 +3,54 @@ dist: xenial matrix: include: - - os: windows - language: sh - env: PYTHON_ROOT="/c/Python37" PYTHON_CHOCO_PKG="python3" - - os: windows - language: sh - env: PYTHON_ROOT="/c/Python27" PYTHON_CHOCO_PKG="python2" + # - os: windows + # language: sh + # env: PYTHON_ROOT="/c/Python37" PYTHON_CHOCO_PKG="python3" + # - os: windows + # language: sh + # env: PYTHON_ROOT="/c/Python27" PYTHON_CHOCO_PKG="python2" + # - os: linux + # dist: trusty + # python: "pypy3" + # - os: linux + # python: 3.7 + # - os: linux + # python: 3.6 + # - os: linux + # python: 3.5 + # - os: linux + # python: 2.7 + # - os: linux + # # The PROJECT environment variable refers to a downstream project that + # # depends on cloudpickle (for example: distributed, joblib, loky). For + # # each project, a matrix item is created, that will run the $PROJECT + # # test suite with the latest cloudpickle, to check for breaking changes + # # introduced by cloudpickle. + # # Side note: for distributed, the pytest major version is constrained to + # # 3 because running it's test suite with pytest 4 fails for now. Also, + # # two failing tests related to openssl and not to cloudpickle are + # # skipped + # python: 3.7 + # sudo: required + # env: PROJECT=distributed + # TEST_REQUIREMENTS="pytest==3.6 numpy pandas mock bokeh" + # PROJECT_URL=https://github.com/dask/distributed.git + # PYTEST_ARGS="-k not test_connection_args and not test_listen_args" + # if: commit_message =~ /(\[ci downstream\]|\[ci distributed\])/ + # - os: linux + # env: PROJECT=loky TEST_REQUIREMENTS="pytest psutil" + # PROJECT_URL=https://github.com/tomMoral/loky.git + # python: 3.7 + # if: commit_message =~ /(\[ci downstream\]|\[ci loky\])/ + # - os: linux + # env: PROJECT=joblib TEST_REQUIREMENTS="pytest numpy distributed" + # PROJECT_URL=https://github.com/joblib/joblib.git + # python: 3.7 + # if: commit_message =~ /(\[ci downstream\]|\[ci joblib\])/ - os: linux - dist: trusty - python: "pypy3" - - os: linux - python: 3.7 - - os: linux - python: 3.6 - - os: linux - python: 3.5 - - os: linux - python: 2.7 - - os: linux - # The PROJECT environment variable refers to a downstream project that - # depends on cloudpickle (for example: distributed, joblib, loky). For - # each project, a matrix item is created, that will run the $PROJECT - # test suite with the latest cloudpickle, to check for breaking changes - # introduced by cloudpickle. - # Side note: for distributed, the pytest major version is constrained to - # 3 because running it's test suite with pytest 4 fails for now. Also, - # two failing tests related to openssl and not to cloudpickle are - # skipped - python: 3.7 - sudo: required - env: PROJECT=distributed - TEST_REQUIREMENTS="pytest==3.6 numpy pandas mock bokeh" - PROJECT_URL=https://github.com/dask/distributed.git - PYTEST_ARGS="-k not test_connection_args and not test_listen_args" - if: commit_message =~ /(\[ci downstream\]|\[ci distributed\])/ - - os: linux - env: PROJECT=loky TEST_REQUIREMENTS="pytest psutil" - PROJECT_URL=https://github.com/tomMoral/loky.git - python: 3.7 - if: commit_message =~ /(\[ci downstream\]|\[ci loky\])/ - - os: linux - env: PROJECT=joblib TEST_REQUIREMENTS="pytest numpy distributed" - PROJECT_URL=https://github.com/joblib/joblib.git + env: PROJECT=ray TEST_REQUIREMENTS="pytest numpy distributed" + PROJECT_URL=https://github.com/ray-project/ray.git python: 3.7 - if: commit_message =~ /(\[ci downstream\]|\[ci joblib\])/ before_install: - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then From 80fcd0ca0b481cff23ad588a2aa23b7b72e01137 Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Thu, 31 Jan 2019 14:25:08 -0800 Subject: [PATCH 02/89] Add more tests --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d6287eddd..f26c2c1e1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,8 +12,8 @@ matrix: # - os: linux # dist: trusty # python: "pypy3" - # - os: linux - # python: 3.7 + - os: linux + python: 3.7 # - os: linux # python: 3.6 # - os: linux From ddae239bf91975badb3b563a5e6df55729d85242 Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Thu, 31 Jan 2019 14:29:30 -0800 Subject: [PATCH 03/89] Update ray dependencies --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index f26c2c1e1..65fb51816 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,8 +12,8 @@ matrix: # - os: linux # dist: trusty # python: "pypy3" - - os: linux - python: 3.7 + # - os: linux + # python: 3.7 # - os: linux # python: 3.6 # - os: linux @@ -48,7 +48,7 @@ matrix: # python: 3.7 # if: commit_message =~ /(\[ci downstream\]|\[ci joblib\])/ - os: linux - env: PROJECT=ray TEST_REQUIREMENTS="pytest numpy distributed" + env: PROJECT=ray TEST_REQUIREMENTS="cython==0.29.0 cmake tensorflow gym opencv-python pyyaml pandas==0.23.4 requests feather-format lxml openpyxl xlrd py-spy setproctitle pytest-timeout flaky" PROJECT_URL=https://github.com/ray-project/ray.git python: 3.7 From 662b620b019efcda19b0122317d31bc5e9e5358e Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Thu, 31 Jan 2019 14:45:54 -0800 Subject: [PATCH 04/89] Update travis testing --- .travis.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 65fb51816..c67dc9c94 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,8 +48,8 @@ matrix: # python: 3.7 # if: commit_message =~ /(\[ci downstream\]|\[ci joblib\])/ - os: linux - env: PROJECT=ray TEST_REQUIREMENTS="cython==0.29.0 cmake tensorflow gym opencv-python pyyaml pandas==0.23.4 requests feather-format lxml openpyxl xlrd py-spy setproctitle pytest-timeout flaky" - PROJECT_URL=https://github.com/ray-project/ray.git + env: PROJECT=ray TEST_REQUIREMENTS="cython==0.29.0 cmake tensorflow gym opencv-python pyyaml pandas==0.23.4 requests feather-format lxml openpyxl xlrd py-spy setproctitle pytest-timeout flaky ray" + PYTEST_ARGS="-v --durations=10" python: 3.7 before_install: @@ -68,7 +68,9 @@ install: - if [[ $PROJECT != "" ]]; then pip install $TEST_REQUIREMENTS; pushd ..; - git clone $PROJECT_URL; + if [[ $PROJECT != 'ray' ]]; then + git clone $PROJECT_URL; + fi; if [[ $PROJECT == "joblib" ]]; then pushd joblib/joblib/externals; source vendor_cloudpickle.sh ../../../cloudpickle; From 31b54c165c7f91e7be87f0e51c4698880c093af4 Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Thu, 31 Jan 2019 14:49:33 -0800 Subject: [PATCH 05/89] minor changes --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c67dc9c94..5d3e89cb6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -70,13 +70,13 @@ install: pushd ..; if [[ $PROJECT != 'ray' ]]; then git clone $PROJECT_URL; - fi; if [[ $PROJECT == "joblib" ]]; then pushd joblib/joblib/externals; source vendor_cloudpickle.sh ../../../cloudpickle; popd; fi; pip install ./$PROJECT; + fi; popd; fi - pip list From 225c4669ea8b55b71c46a1a9e95ddd3b670e142f Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Thu, 31 Jan 2019 14:56:20 -0800 Subject: [PATCH 06/89] clone ray but dont install to try to run tests --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5d3e89cb6..615284a3d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -68,14 +68,14 @@ install: - if [[ $PROJECT != "" ]]; then pip install $TEST_REQUIREMENTS; pushd ..; - if [[ $PROJECT != 'ray' ]]; then - git clone $PROJECT_URL; + git clone $PROJECT_URL; if [[ $PROJECT == "joblib" ]]; then pushd joblib/joblib/externals; source vendor_cloudpickle.sh ../../../cloudpickle; popd; fi; - pip install ./$PROJECT; + if [[ $PROJECT != 'ray' ]]; then + pip install ./$PROJECT; fi; popd; fi From 9d012697da6b50d83af96f9867037b2c5b011330 Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Thu, 31 Jan 2019 15:02:30 -0800 Subject: [PATCH 07/89] Added ray project url --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 615284a3d..3bd650587 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,6 +49,7 @@ matrix: # if: commit_message =~ /(\[ci downstream\]|\[ci joblib\])/ - os: linux env: PROJECT=ray TEST_REQUIREMENTS="cython==0.29.0 cmake tensorflow gym opencv-python pyyaml pandas==0.23.4 requests feather-format lxml openpyxl xlrd py-spy setproctitle pytest-timeout flaky ray" + PROJECT_URL=https://github.com/ray-project/ray.git PYTEST_ARGS="-v --durations=10" python: 3.7 @@ -74,7 +75,7 @@ install: source vendor_cloudpickle.sh ../../../cloudpickle; popd; fi; - if [[ $PROJECT != 'ray' ]]; then + if [[ $PROJECT != "ray" ]]; then pip install ./$PROJECT; fi; popd; From 802cf94fda16ad64779eacc014e5a314d766758d Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Thu, 31 Jan 2019 15:04:57 -0800 Subject: [PATCH 08/89] Remove pytest args --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3bd650587..3f36a8441 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,7 +50,6 @@ matrix: - os: linux env: PROJECT=ray TEST_REQUIREMENTS="cython==0.29.0 cmake tensorflow gym opencv-python pyyaml pandas==0.23.4 requests feather-format lxml openpyxl xlrd py-spy setproctitle pytest-timeout flaky ray" PROJECT_URL=https://github.com/ray-project/ray.git - PYTEST_ARGS="-v --durations=10" python: 3.7 before_install: From 1f75534d137b818be10c5b72324da600866beb48 Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Thu, 31 Jan 2019 15:09:08 -0800 Subject: [PATCH 09/89] Reorder tensorflow to end of requirements --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3f36a8441..ffa802787 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,8 +48,9 @@ matrix: # python: 3.7 # if: commit_message =~ /(\[ci downstream\]|\[ci joblib\])/ - os: linux - env: PROJECT=ray TEST_REQUIREMENTS="cython==0.29.0 cmake tensorflow gym opencv-python pyyaml pandas==0.23.4 requests feather-format lxml openpyxl xlrd py-spy setproctitle pytest-timeout flaky ray" + env: PROJECT=ray TEST_REQUIREMENTS="cython==0.29.0 cmake gym opencv-python pyyaml pandas==0.23.4 requests feather-format lxml openpyxl xlrd py-spy setproctitle pytest-timeout flaky ray tensorflow" PROJECT_URL=https://github.com/ray-project/ray.git + PYTEST_ARGS="-v --durations=10" python: 3.7 before_install: From 9ebd41d4fd0346b5b092275954b4316d43f36182 Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Thu, 31 Jan 2019 15:11:53 -0800 Subject: [PATCH 10/89] remove pytest arguments --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ffa802787..ea1bffa77 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,7 +50,6 @@ matrix: - os: linux env: PROJECT=ray TEST_REQUIREMENTS="cython==0.29.0 cmake gym opencv-python pyyaml pandas==0.23.4 requests feather-format lxml openpyxl xlrd py-spy setproctitle pytest-timeout flaky ray tensorflow" PROJECT_URL=https://github.com/ray-project/ray.git - PYTEST_ARGS="-v --durations=10" python: 3.7 before_install: From 014da2fdf44bc97c15071101d9f7f05590388839 Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Thu, 31 Jan 2019 15:15:38 -0800 Subject: [PATCH 11/89] Reduce python version to 3.5 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ea1bffa77..5cf46e8ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,7 +50,7 @@ matrix: - os: linux env: PROJECT=ray TEST_REQUIREMENTS="cython==0.29.0 cmake gym opencv-python pyyaml pandas==0.23.4 requests feather-format lxml openpyxl xlrd py-spy setproctitle pytest-timeout flaky ray tensorflow" PROJECT_URL=https://github.com/ray-project/ray.git - python: 3.7 + python: 3.5 before_install: - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then From 80c46c6c19a19f048054aa742959920867000a1e Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Thu, 31 Jan 2019 15:29:13 -0800 Subject: [PATCH 12/89] temp --- .travis.yml | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5cf46e8ca..8bfbbcf9a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,7 +48,7 @@ matrix: # python: 3.7 # if: commit_message =~ /(\[ci downstream\]|\[ci joblib\])/ - os: linux - env: PROJECT=ray TEST_REQUIREMENTS="cython==0.29.0 cmake gym opencv-python pyyaml pandas==0.23.4 requests feather-format lxml openpyxl xlrd py-spy setproctitle pytest-timeout flaky ray tensorflow" + env: PROJECT=ray TEST_REQUIREMENTS="setproctitle pytest-timeout ray" PROJECT_URL=https://github.com/ray-project/ray.git python: 3.5 @@ -68,14 +68,14 @@ install: - if [[ $PROJECT != "" ]]; then pip install $TEST_REQUIREMENTS; pushd ..; - git clone $PROJECT_URL; - if [[ $PROJECT == "joblib" ]]; then - pushd joblib/joblib/externals; - source vendor_cloudpickle.sh ../../../cloudpickle; - popd; - fi; if [[ $PROJECT != "ray" ]]; then - pip install ./$PROJECT; + git clone $PROJECT_URL; + if [[ $PROJECT == "joblib" ]]; then + pushd joblib/joblib/externals; + source vendor_cloudpickle.sh ../../../cloudpickle; + popd; + fi; + pip install ./$PROJECT; fi; popd; fi @@ -89,7 +89,7 @@ before_script: script: - COVERAGE_PROCESS_START="$TRAVIS_BUILD_DIR/.coveragerc" PYTHONPATH='.:tests' pytest -r s - | - if [[ $PROJECT != "" ]]; then + if [[ $PROJECT != "" && $PROJECT != 'ray']]; then pushd ../$PROJECT # pytest hangs if given an empty quoted string (it will happen # if PYTEST_ARGS was not defined) so we have to split the cases. @@ -103,6 +103,8 @@ script: if [[ "$TEST_RETURN_CODE" != "0" ]]; then exit $TEST_RETURN_CODE fi + else + echo python -c "import os,ray,sys;print(os.path.dirname(ray.__file__));sys.stdout.flush()" fi after_success: - coverage combine --append From 15a1aac7b61f0c4d1e9e3595008e184a656cb05b Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Thu, 31 Jan 2019 15:31:15 -0800 Subject: [PATCH 13/89] Remove echo --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8bfbbcf9a..9c2e2d220 100644 --- a/.travis.yml +++ b/.travis.yml @@ -104,7 +104,7 @@ script: exit $TEST_RETURN_CODE fi else - echo python -c "import os,ray,sys;print(os.path.dirname(ray.__file__));sys.stdout.flush()" + python -c "import os,ray,sys;print(os.path.dirname(ray.__file__));sys.stdout.flush()" fi after_success: - coverage combine --append From 7287daf0f4ceaf94e3e932b4fc4ba6e643bb04d6 Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Thu, 31 Jan 2019 15:39:00 -0800 Subject: [PATCH 14/89] load ray file test --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9c2e2d220..f11764271 100644 --- a/.travis.yml +++ b/.travis.yml @@ -104,7 +104,8 @@ script: exit $TEST_RETURN_CODE fi else - python -c "import os,ray,sys;print(os.path.dirname(ray.__file__));sys.stdout.flush()" + RAY_DIR = $(python -c "import os,ray,sys;print(os.path.dirname(ray.__file__));sys.stdout.flush()") + pytest RAY_DIR/ray/test/test_ray_init.py fi after_success: - coverage combine --append From b2d7d6ed745ba77a71db364c383fb528240a1851 Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Thu, 31 Jan 2019 15:44:49 -0800 Subject: [PATCH 15/89] Did work --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f11764271..b90bf3854 100644 --- a/.travis.yml +++ b/.travis.yml @@ -105,7 +105,7 @@ script: fi else RAY_DIR = $(python -c "import os,ray,sys;print(os.path.dirname(ray.__file__));sys.stdout.flush()") - pytest RAY_DIR/ray/test/test_ray_init.py + pytest RAY_DIR/test/test_ray_init.py fi after_success: - coverage combine --append From 6aed32754e21efced89fc6882374acf42eea5c94 Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Thu, 31 Jan 2019 15:51:02 -0800 Subject: [PATCH 16/89] bash syntax error --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b90bf3854..c3c52b205 100644 --- a/.travis.yml +++ b/.travis.yml @@ -104,8 +104,8 @@ script: exit $TEST_RETURN_CODE fi else - RAY_DIR = $(python -c "import os,ray,sys;print(os.path.dirname(ray.__file__));sys.stdout.flush()") - pytest RAY_DIR/test/test_ray_init.py + RAY_DIR="$(python -c "import os,ray,sys;print(os.path.dirname(ray.__file__));sys.stdout.flush()")" + pytest $RAY_DIR/test/test_ray_init.py fi after_success: - coverage combine --append From 82c940ff3ccf863d9f8b46b4b45a03f806941dfc Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Thu, 31 Jan 2019 15:54:11 -0800 Subject: [PATCH 17/89] More syntax errors --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c3c52b205..4db8757f6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -89,7 +89,7 @@ before_script: script: - COVERAGE_PROCESS_START="$TRAVIS_BUILD_DIR/.coveragerc" PYTHONPATH='.:tests' pytest -r s - | - if [[ $PROJECT != "" && $PROJECT != 'ray']]; then + if [[ $PROJECT != "" && $PROJECT != 'ray' ]]; then pushd ../$PROJECT # pytest hangs if given an empty quoted string (it will happen # if PYTEST_ARGS was not defined) so we have to split the cases. From 953028625e6cec3dad304874f5491b1247fb9f55 Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Sun, 3 Feb 2019 14:31:25 -0800 Subject: [PATCH 18/89] Source new cloudpickle in ray --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 4db8757f6..aafc5f516 100644 --- a/.travis.yml +++ b/.travis.yml @@ -105,6 +105,8 @@ script: fi else RAY_DIR="$(python -c "import os,ray,sys;print(os.path.dirname(ray.__file__));sys.stdout.flush()")" + rm $RAY_DIR/cloudpickle/cloudpickle.py + cp cloudpickle/cloudpickle.py $RAY_DIR/cloudpickle/cloudpickle.py pytest $RAY_DIR/test/test_ray_init.py fi after_success: From a05bf2e573c8f1d89b5048c84626a5eab041a906 Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Mon, 4 Feb 2019 11:22:23 -0800 Subject: [PATCH 19/89] Fetch ray from git but only use it to run tests --- .travis.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index aafc5f516..9ba9274fc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,6 +50,7 @@ matrix: - os: linux env: PROJECT=ray TEST_REQUIREMENTS="setproctitle pytest-timeout ray" PROJECT_URL=https://github.com/ray-project/ray.git + PYTEST_ARGS="--duration 10 $PROJECT/test/mini_test.py" python: 3.5 before_install: @@ -68,14 +69,18 @@ install: - if [[ $PROJECT != "" ]]; then pip install $TEST_REQUIREMENTS; pushd ..; - if [[ $PROJECT != "ray" ]]; then - git clone $PROJECT_URL; - if [[ $PROJECT == "joblib" ]]; then - pushd joblib/joblib/externals; - source vendor_cloudpickle.sh ../../../cloudpickle; - popd; - fi; - pip install ./$PROJECT; + git clone $PROJECT_URL; + if [[ $PROJECT == "joblib" ]]; then + pushd joblib/joblib/externals; + source vendor_cloudpickle.sh ../../../cloudpickle; + popd; + fi; + if [[ $PROJECT == "ray" ]]; then + RAY_DIR="$(python -c "import os,ray,sys;print(os.path.dirname(ray.__file__));sys.stdout.flush()")" + rm $RAY_DIR/cloudpickle/cloudpickle.py + cp cloudpickle/cloudpickle.py $RAY_DIR/cloudpickle/cloudpickle.py + else + pip install ./$PROJECT; fi; popd; fi @@ -89,7 +94,7 @@ before_script: script: - COVERAGE_PROCESS_START="$TRAVIS_BUILD_DIR/.coveragerc" PYTHONPATH='.:tests' pytest -r s - | - if [[ $PROJECT != "" && $PROJECT != 'ray' ]]; then + if [[ $PROJECT != "" ]]; then pushd ../$PROJECT # pytest hangs if given an empty quoted string (it will happen # if PYTEST_ARGS was not defined) so we have to split the cases. @@ -103,11 +108,6 @@ script: if [[ "$TEST_RETURN_CODE" != "0" ]]; then exit $TEST_RETURN_CODE fi - else - RAY_DIR="$(python -c "import os,ray,sys;print(os.path.dirname(ray.__file__));sys.stdout.flush()")" - rm $RAY_DIR/cloudpickle/cloudpickle.py - cp cloudpickle/cloudpickle.py $RAY_DIR/cloudpickle/cloudpickle.py - pytest $RAY_DIR/test/test_ray_init.py fi after_success: - coverage combine --append From 5b8c202311f79bae120a0aeea530186b4f5592b1 Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Mon, 4 Feb 2019 12:22:13 -0800 Subject: [PATCH 20/89] Reorder when we update the ray script --- .travis.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9ba9274fc..be9ee51bd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,7 +50,7 @@ matrix: - os: linux env: PROJECT=ray TEST_REQUIREMENTS="setproctitle pytest-timeout ray" PROJECT_URL=https://github.com/ray-project/ray.git - PYTEST_ARGS="--duration 10 $PROJECT/test/mini_test.py" + PYTEST_ARGS="--duration 10 test/mini_test.py" python: 3.5 before_install: @@ -69,17 +69,18 @@ install: - if [[ $PROJECT != "" ]]; then pip install $TEST_REQUIREMENTS; pushd ..; + if [[ $PROJECT == "ray" ]]; then + RAY_DIR="$(python -c "import os,ray,sys;print(os.path.dirname(ray.__file__));sys.stdout.flush()")" + rm $RAY_DIR/cloudpickle/cloudpickle.py + cp cloudpickle/cloudpickle.py $RAY_DIR/cloudpickle/cloudpickle.py + fi; git clone $PROJECT_URL; if [[ $PROJECT == "joblib" ]]; then pushd joblib/joblib/externals; source vendor_cloudpickle.sh ../../../cloudpickle; popd; fi; - if [[ $PROJECT == "ray" ]]; then - RAY_DIR="$(python -c "import os,ray,sys;print(os.path.dirname(ray.__file__));sys.stdout.flush()")" - rm $RAY_DIR/cloudpickle/cloudpickle.py - cp cloudpickle/cloudpickle.py $RAY_DIR/cloudpickle/cloudpickle.py - else + if [[ $PROJECT != "ray" ]]; then pip install ./$PROJECT; fi; popd; From c3fbffdb39a630dca6ce9499c2725bc4c42a4447 Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Mon, 4 Feb 2019 12:45:58 -0800 Subject: [PATCH 21/89] Fix syntax error --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index be9ee51bd..38903ec7e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -70,9 +70,9 @@ install: pip install $TEST_REQUIREMENTS; pushd ..; if [[ $PROJECT == "ray" ]]; then - RAY_DIR="$(python -c "import os,ray,sys;print(os.path.dirname(ray.__file__));sys.stdout.flush()")" - rm $RAY_DIR/cloudpickle/cloudpickle.py - cp cloudpickle/cloudpickle.py $RAY_DIR/cloudpickle/cloudpickle.py + RAY_DIR="$(python -c "import os,ray,sys;print(os.path.dirname(ray.__file__));sys.stdout.flush()")"; + rm $RAY_DIR/cloudpickle/cloudpickle.py; + cp cloudpickle/cloudpickle/cloudpickle.py $RAY_DIR/cloudpickle/cloudpickle.py; fi; git clone $PROJECT_URL; if [[ $PROJECT == "joblib" ]]; then From 001d164e319fc9f047f25446de457e07a0d487dd Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Mon, 4 Feb 2019 12:49:20 -0800 Subject: [PATCH 22/89] Remove duration argument --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 38903ec7e..2ec3c6b7c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,7 +50,7 @@ matrix: - os: linux env: PROJECT=ray TEST_REQUIREMENTS="setproctitle pytest-timeout ray" PROJECT_URL=https://github.com/ray-project/ray.git - PYTEST_ARGS="--duration 10 test/mini_test.py" + PYTEST_ARGS="test/mini_test.py" python: 3.5 before_install: From db9f5c04baa983e1b784b8ddc34d6c25670f0668 Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Wed, 6 Feb 2019 00:18:42 -0800 Subject: [PATCH 23/89] Add duration 10 but remove test file --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2ec3c6b7c..4ee644400 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,9 +48,9 @@ matrix: # python: 3.7 # if: commit_message =~ /(\[ci downstream\]|\[ci joblib\])/ - os: linux - env: PROJECT=ray TEST_REQUIREMENTS="setproctitle pytest-timeout ray" + env: PROJECT=ray TEST_REQUIREMENTS="setproctitle ray" PROJECT_URL=https://github.com/ray-project/ray.git - PYTEST_ARGS="test/mini_test.py" + PYTEST_ARGS="--duration 10" python: 3.5 before_install: From 3d8e034ea2354d931966c93cf00c3060f204b5b5 Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Wed, 6 Feb 2019 00:30:16 -0800 Subject: [PATCH 24/89] Added = in command --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4ee644400..eb0e11562 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,7 +50,7 @@ matrix: - os: linux env: PROJECT=ray TEST_REQUIREMENTS="setproctitle ray" PROJECT_URL=https://github.com/ray-project/ray.git - PYTEST_ARGS="--duration 10" + PYTEST_ARGS="--duration=10" python: 3.5 before_install: From c037e45efde813d7a59d8fbfdbe301062285e286 Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Wed, 6 Feb 2019 10:37:11 -0800 Subject: [PATCH 25/89] Create PROJECT_DIR variable --- .travis.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index eb0e11562..c1723ec8f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -70,11 +70,13 @@ install: pip install $TEST_REQUIREMENTS; pushd ..; if [[ $PROJECT == "ray" ]]; then - RAY_DIR="$(python -c "import os,ray,sys;print(os.path.dirname(ray.__file__));sys.stdout.flush()")"; + PROJECT_DIR="$(python -c "import os,ray,sys;print(os.path.dirname(ray.__file__));sys.stdout.flush()")"; rm $RAY_DIR/cloudpickle/cloudpickle.py; cp cloudpickle/cloudpickle/cloudpickle.py $RAY_DIR/cloudpickle/cloudpickle.py; + else + PROJECT_DIR="../$PROJECT"; + git clone $PROJECT_URL; fi; - git clone $PROJECT_URL; if [[ $PROJECT == "joblib" ]]; then pushd joblib/joblib/externals; source vendor_cloudpickle.sh ../../../cloudpickle; @@ -96,7 +98,7 @@ script: - COVERAGE_PROCESS_START="$TRAVIS_BUILD_DIR/.coveragerc" PYTHONPATH='.:tests' pytest -r s - | if [[ $PROJECT != "" ]]; then - pushd ../$PROJECT + pushd $PROJECT_DIR # pytest hangs if given an empty quoted string (it will happen # if PYTEST_ARGS was not defined) so we have to split the cases. if [[ "$PYTEST_ARGS" != "" ]]; then From 416c8e809d2d25a1928d4e39873dbb4c8240fa34 Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Wed, 6 Feb 2019 12:17:55 -0800 Subject: [PATCH 26/89] Use root flag when running pytest --- .travis.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index c1723ec8f..0b8c14758 100644 --- a/.travis.yml +++ b/.travis.yml @@ -68,12 +68,12 @@ install: fi - if [[ $PROJECT != "" ]]; then pip install $TEST_REQUIREMENTS; - pushd ..; if [[ $PROJECT == "ray" ]]; then PROJECT_DIR="$(python -c "import os,ray,sys;print(os.path.dirname(ray.__file__));sys.stdout.flush()")"; rm $RAY_DIR/cloudpickle/cloudpickle.py; cp cloudpickle/cloudpickle/cloudpickle.py $RAY_DIR/cloudpickle/cloudpickle.py; else + pushd ..; PROJECT_DIR="../$PROJECT"; git clone $PROJECT_URL; fi; @@ -84,8 +84,8 @@ install: fi; if [[ $PROJECT != "ray" ]]; then pip install ./$PROJECT; + popd; fi; - popd; fi - pip list before_script: @@ -98,16 +98,14 @@ script: - COVERAGE_PROCESS_START="$TRAVIS_BUILD_DIR/.coveragerc" PYTHONPATH='.:tests' pytest -r s - | if [[ $PROJECT != "" ]]; then - pushd $PROJECT_DIR # pytest hangs if given an empty quoted string (it will happen # if PYTEST_ARGS was not defined) so we have to split the cases. if [[ "$PYTEST_ARGS" != "" ]]; then - pytest -vl "$PYTEST_ARGS" + pytest -vl --root=$PROJeCT_DIR "$PYTEST_ARGS" else pytest -vl fi TEST_RETURN_CODE=$? - popd if [[ "$TEST_RETURN_CODE" != "0" ]]; then exit $TEST_RETURN_CODE fi From 508bfafd32a7d4f64da21ab58e8f483144386b7a Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Wed, 6 Feb 2019 12:23:41 -0800 Subject: [PATCH 27/89] Fix typo --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0b8c14758..3a95f3be4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -101,7 +101,7 @@ script: # pytest hangs if given an empty quoted string (it will happen # if PYTEST_ARGS was not defined) so we have to split the cases. if [[ "$PYTEST_ARGS" != "" ]]; then - pytest -vl --root=$PROJeCT_DIR "$PYTEST_ARGS" + pytest -vl --root=$PROJECT_DIR "$PYTEST_ARGS" else pytest -vl fi From 0f016b127827e38d1f890c5eaec5827e36ba469c Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Wed, 6 Feb 2019 12:30:47 -0800 Subject: [PATCH 28/89] update ray project dir for testing --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3a95f3be4..928c9d75e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -70,8 +70,9 @@ install: pip install $TEST_REQUIREMENTS; if [[ $PROJECT == "ray" ]]; then PROJECT_DIR="$(python -c "import os,ray,sys;print(os.path.dirname(ray.__file__));sys.stdout.flush()")"; - rm $RAY_DIR/cloudpickle/cloudpickle.py; + rm $PROJECT_DIR/cloudpickle/cloudpickle.py; cp cloudpickle/cloudpickle/cloudpickle.py $RAY_DIR/cloudpickle/cloudpickle.py; + PROJECT_DIR="$PROJECT_DIR/test" else pushd ..; PROJECT_DIR="../$PROJECT"; From 84e2264d4dcc9d2aaa2504334b73b7886b84ee9a Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Wed, 6 Feb 2019 13:46:01 -0800 Subject: [PATCH 29/89] CLean up code --- .travis.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 928c9d75e..238737333 100644 --- a/.travis.yml +++ b/.travis.yml @@ -77,13 +77,11 @@ install: pushd ..; PROJECT_DIR="../$PROJECT"; git clone $PROJECT_URL; - fi; - if [[ $PROJECT == "joblib" ]]; then - pushd joblib/joblib/externals; - source vendor_cloudpickle.sh ../../../cloudpickle; - popd; - fi; - if [[ $PROJECT != "ray" ]]; then + if [[ $PROJECT == "joblib" ]]; then + pushd joblib/joblib/externals; + source vendor_cloudpickle.sh ../../../cloudpickle; + popd; + fi; pip install ./$PROJECT; popd; fi; From 0c756b5a84bd290b1ad8cca0328ee38446a16fe9 Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Wed, 6 Feb 2019 15:42:24 -0800 Subject: [PATCH 30/89] syntax error --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 238737333..e88bcc94e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -72,7 +72,7 @@ install: PROJECT_DIR="$(python -c "import os,ray,sys;print(os.path.dirname(ray.__file__));sys.stdout.flush()")"; rm $PROJECT_DIR/cloudpickle/cloudpickle.py; cp cloudpickle/cloudpickle/cloudpickle.py $RAY_DIR/cloudpickle/cloudpickle.py; - PROJECT_DIR="$PROJECT_DIR/test" + PROJECT_DIR="$PROJECT_DIR/test"; else pushd ..; PROJECT_DIR="../$PROJECT"; From eb23a601c6fd6d2a2ba76f1502bfe919723b12c8 Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Wed, 6 Feb 2019 20:25:06 -0800 Subject: [PATCH 31/89] Move tests to tests/ folder --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e88bcc94e..9b7075309 100644 --- a/.travis.yml +++ b/.travis.yml @@ -72,7 +72,8 @@ install: PROJECT_DIR="$(python -c "import os,ray,sys;print(os.path.dirname(ray.__file__));sys.stdout.flush()")"; rm $PROJECT_DIR/cloudpickle/cloudpickle.py; cp cloudpickle/cloudpickle/cloudpickle.py $RAY_DIR/cloudpickle/cloudpickle.py; - PROJECT_DIR="$PROJECT_DIR/test"; + mv $PROJECT_DIR/test $PROJECT_DIR/tests + PROJECT_DIR="$PROJECT_DIR"; else pushd ..; PROJECT_DIR="../$PROJECT"; From 8a27fe649218d71f786266f9b2428aa26fd863e1 Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Wed, 6 Feb 2019 20:30:31 -0800 Subject: [PATCH 32/89] syntax error --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9b7075309..20cfcee87 100644 --- a/.travis.yml +++ b/.travis.yml @@ -72,7 +72,7 @@ install: PROJECT_DIR="$(python -c "import os,ray,sys;print(os.path.dirname(ray.__file__));sys.stdout.flush()")"; rm $PROJECT_DIR/cloudpickle/cloudpickle.py; cp cloudpickle/cloudpickle/cloudpickle.py $RAY_DIR/cloudpickle/cloudpickle.py; - mv $PROJECT_DIR/test $PROJECT_DIR/tests + mv $PROJECT_DIR/test $PROJECT_DIR/tests; PROJECT_DIR="$PROJECT_DIR"; else pushd ..; From 39d658785eed1749a7f5cb40ef225e0142d8b781 Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Wed, 6 Feb 2019 21:04:56 -0800 Subject: [PATCH 33/89] Remove root flag but keep argument --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 20cfcee87..2b15a84f0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -101,7 +101,7 @@ script: # pytest hangs if given an empty quoted string (it will happen # if PYTEST_ARGS was not defined) so we have to split the cases. if [[ "$PYTEST_ARGS" != "" ]]; then - pytest -vl --root=$PROJECT_DIR "$PYTEST_ARGS" + pytest -vl $PROJECT_DIR "$PYTEST_ARGS" else pytest -vl fi From 712b0d03545b2d096845eac0d8a15bd96f01c4f1 Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Wed, 6 Feb 2019 21:28:20 -0800 Subject: [PATCH 34/89] Change directories instead of using pytest args --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2b15a84f0..65c816bc2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -97,11 +97,12 @@ before_script: script: - COVERAGE_PROCESS_START="$TRAVIS_BUILD_DIR/.coveragerc" PYTHONPATH='.:tests' pytest -r s - | + pushd $PROJECT_DIR if [[ $PROJECT != "" ]]; then # pytest hangs if given an empty quoted string (it will happen # if PYTEST_ARGS was not defined) so we have to split the cases. if [[ "$PYTEST_ARGS" != "" ]]; then - pytest -vl $PROJECT_DIR "$PYTEST_ARGS" + pytest -vl "$PYTEST_ARGS" else pytest -vl fi @@ -109,6 +110,7 @@ script: if [[ "$TEST_RETURN_CODE" != "0" ]]; then exit $TEST_RETURN_CODE fi + popd fi after_success: - coverage combine --append From 082b6ab33960c57bd9d0ece688319c6287837c86 Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Wed, 6 Feb 2019 21:35:28 -0800 Subject: [PATCH 35/89] Adding import to avoid error --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 65c816bc2..32668aeb2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,7 +48,7 @@ matrix: # python: 3.7 # if: commit_message =~ /(\[ci downstream\]|\[ci joblib\])/ - os: linux - env: PROJECT=ray TEST_REQUIREMENTS="setproctitle ray" + env: PROJECT=ray TEST_REQUIREMENTS="setproctitle hypothesis ray" PROJECT_URL=https://github.com/ray-project/ray.git PYTEST_ARGS="--duration=10" python: 3.5 From 687d0bc8b7c652ca2c880653a94f2f530a30ef6a Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Wed, 6 Feb 2019 21:39:17 -0800 Subject: [PATCH 36/89] Specify testing directory for pytest --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 32668aeb2..e2836fed2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -73,7 +73,7 @@ install: rm $PROJECT_DIR/cloudpickle/cloudpickle.py; cp cloudpickle/cloudpickle/cloudpickle.py $RAY_DIR/cloudpickle/cloudpickle.py; mv $PROJECT_DIR/test $PROJECT_DIR/tests; - PROJECT_DIR="$PROJECT_DIR"; + PROJECT_DIR="$PROJECT_DIR/test"; else pushd ..; PROJECT_DIR="../$PROJECT"; From b3b7e7f10f03599b7f5d06706dc2e13d5cb0a7bf Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Wed, 6 Feb 2019 21:40:34 -0800 Subject: [PATCH 37/89] Remove command that moves testing directory --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e2836fed2..07087d96e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -72,7 +72,6 @@ install: PROJECT_DIR="$(python -c "import os,ray,sys;print(os.path.dirname(ray.__file__));sys.stdout.flush()")"; rm $PROJECT_DIR/cloudpickle/cloudpickle.py; cp cloudpickle/cloudpickle/cloudpickle.py $RAY_DIR/cloudpickle/cloudpickle.py; - mv $PROJECT_DIR/test $PROJECT_DIR/tests; PROJECT_DIR="$PROJECT_DIR/test"; else pushd ..; From 9b5625a91ce2f79a3a595629ec5738773b1ac2f2 Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Wed, 6 Feb 2019 21:46:01 -0800 Subject: [PATCH 38/89] Update syntax error --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 07087d96e..6aece8d41 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,7 +48,7 @@ matrix: # python: 3.7 # if: commit_message =~ /(\[ci downstream\]|\[ci joblib\])/ - os: linux - env: PROJECT=ray TEST_REQUIREMENTS="setproctitle hypothesis ray" + env: PROJECT=ray TEST_REQUIREMENTS="setproctitle hypothesis" PROJECT_URL=https://github.com/ray-project/ray.git PYTEST_ARGS="--duration=10" python: 3.5 @@ -69,9 +69,10 @@ install: - if [[ $PROJECT != "" ]]; then pip install $TEST_REQUIREMENTS; if [[ $PROJECT == "ray" ]]; then + pip install ray PROJECT_DIR="$(python -c "import os,ray,sys;print(os.path.dirname(ray.__file__));sys.stdout.flush()")"; rm $PROJECT_DIR/cloudpickle/cloudpickle.py; - cp cloudpickle/cloudpickle/cloudpickle.py $RAY_DIR/cloudpickle/cloudpickle.py; + cp cloudpickle/cloudpickle/cloudpickle.py $PROJECT_DIR/cloudpickle/cloudpickle.py; PROJECT_DIR="$PROJECT_DIR/test"; else pushd ..; From e42cd05f4466bd7779ec777318c8741083a20314 Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Wed, 6 Feb 2019 21:50:50 -0800 Subject: [PATCH 39/89] syntax error --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6aece8d41..d8fd6420f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -69,7 +69,7 @@ install: - if [[ $PROJECT != "" ]]; then pip install $TEST_REQUIREMENTS; if [[ $PROJECT == "ray" ]]; then - pip install ray + pip install ray; PROJECT_DIR="$(python -c "import os,ray,sys;print(os.path.dirname(ray.__file__));sys.stdout.flush()")"; rm $PROJECT_DIR/cloudpickle/cloudpickle.py; cp cloudpickle/cloudpickle/cloudpickle.py $PROJECT_DIR/cloudpickle/cloudpickle.py; From fba2a385f54ba612d74a879bf112b2292eb03bf5 Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Wed, 6 Feb 2019 21:53:40 -0800 Subject: [PATCH 40/89] Update cloudpickle path --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d8fd6420f..cd5eb33c9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -72,7 +72,7 @@ install: pip install ray; PROJECT_DIR="$(python -c "import os,ray,sys;print(os.path.dirname(ray.__file__));sys.stdout.flush()")"; rm $PROJECT_DIR/cloudpickle/cloudpickle.py; - cp cloudpickle/cloudpickle/cloudpickle.py $PROJECT_DIR/cloudpickle/cloudpickle.py; + cp cloudpickle/cloudpickle.py $PROJECT_DIR/cloudpickle/cloudpickle.py; PROJECT_DIR="$PROJECT_DIR/test"; else pushd ..; From 5b3867bf72f7744f92c59605fbc5c2a4b291981f Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Wed, 6 Feb 2019 22:01:21 -0800 Subject: [PATCH 41/89] Add other tests back in --- .travis.yml | 88 ++++++++++++++++++++++++++--------------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/.travis.yml b/.travis.yml index cd5eb33c9..e8973b1e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,50 +3,50 @@ dist: xenial matrix: include: - # - os: windows - # language: sh - # env: PYTHON_ROOT="/c/Python37" PYTHON_CHOCO_PKG="python3" - # - os: windows - # language: sh - # env: PYTHON_ROOT="/c/Python27" PYTHON_CHOCO_PKG="python2" - # - os: linux - # dist: trusty - # python: "pypy3" - # - os: linux - # python: 3.7 - # - os: linux - # python: 3.6 - # - os: linux - # python: 3.5 - # - os: linux - # python: 2.7 - # - os: linux - # # The PROJECT environment variable refers to a downstream project that - # # depends on cloudpickle (for example: distributed, joblib, loky). For - # # each project, a matrix item is created, that will run the $PROJECT - # # test suite with the latest cloudpickle, to check for breaking changes - # # introduced by cloudpickle. - # # Side note: for distributed, the pytest major version is constrained to - # # 3 because running it's test suite with pytest 4 fails for now. Also, - # # two failing tests related to openssl and not to cloudpickle are - # # skipped - # python: 3.7 - # sudo: required - # env: PROJECT=distributed - # TEST_REQUIREMENTS="pytest==3.6 numpy pandas mock bokeh" - # PROJECT_URL=https://github.com/dask/distributed.git - # PYTEST_ARGS="-k not test_connection_args and not test_listen_args" - # if: commit_message =~ /(\[ci downstream\]|\[ci distributed\])/ - # - os: linux - # env: PROJECT=loky TEST_REQUIREMENTS="pytest psutil" - # PROJECT_URL=https://github.com/tomMoral/loky.git - # python: 3.7 - # if: commit_message =~ /(\[ci downstream\]|\[ci loky\])/ - # - os: linux - # env: PROJECT=joblib TEST_REQUIREMENTS="pytest numpy distributed" - # PROJECT_URL=https://github.com/joblib/joblib.git - # python: 3.7 - # if: commit_message =~ /(\[ci downstream\]|\[ci joblib\])/ + - os: windows + language: sh + env: PYTHON_ROOT="/c/Python37" PYTHON_CHOCO_PKG="python3" + - os: windows + language: sh + env: PYTHON_ROOT="/c/Python27" PYTHON_CHOCO_PKG="python2" + - os: linux + dist: trusty + python: "pypy3" + - os: linux + python: 3.7 + - os: linux + python: 3.6 + - os: linux + python: 3.5 + - os: linux + python: 2.7 + - os: linux + # The PROJECT environment variable refers to a downstream project that + # depends on cloudpickle (for example: distributed, joblib, loky). For + # each project, a matrix item is created, that will run the $PROJECT + # test suite with the latest cloudpickle, to check for breaking changes + # introduced by cloudpickle. + # Side note: for distributed, the pytest major version is constrained to + # 3 because running it's test suite with pytest 4 fails for now. Also, + # two failing tests related to openssl and not to cloudpickle are + # skipped + python: 3.7 + sudo: required + env: PROJECT=distributed + TEST_REQUIREMENTS="pytest==3.6 numpy pandas mock bokeh" + PROJECT_URL=https://github.com/dask/distributed.git + PYTEST_ARGS="-k not test_connection_args and not test_listen_args" + if: commit_message =~ /(\[ci downstream\]|\[ci distributed\])/ + - os: linux + env: PROJECT=loky TEST_REQUIREMENTS="pytest psutil" + PROJECT_URL=https://github.com/tomMoral/loky.git + python: 3.7 + if: commit_message =~ /(\[ci downstream\]|\[ci loky\])/ + - os: linux + env: PROJECT=joblib TEST_REQUIREMENTS="pytest numpy distributed" + PROJECT_URL=https://github.com/joblib/joblib.git + python: 3.7 + if: commit_message =~ /(\[ci downstream\]|\[ci joblib\])/ - os: linux env: PROJECT=ray TEST_REQUIREMENTS="setproctitle hypothesis" PROJECT_URL=https://github.com/ray-project/ray.git From e7c6a12aeb2a556404366c995fb8ffb8b24b4c4d Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Fri, 15 Feb 2019 10:37:59 -0800 Subject: [PATCH 42/89] move where push directory is --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e8973b1e7..635a27e51 100644 --- a/.travis.yml +++ b/.travis.yml @@ -97,8 +97,8 @@ before_script: script: - COVERAGE_PROCESS_START="$TRAVIS_BUILD_DIR/.coveragerc" PYTHONPATH='.:tests' pytest -r s - | - pushd $PROJECT_DIR if [[ $PROJECT != "" ]]; then + pushd $PROJECT_DIR # pytest hangs if given an empty quoted string (it will happen # if PYTEST_ARGS was not defined) so we have to split the cases. if [[ "$PYTEST_ARGS" != "" ]]; then From 75cb061020b7d586bd38b27457c242a4cb053432 Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Fri, 15 Feb 2019 10:49:50 -0800 Subject: [PATCH 43/89] Remove popd --- .travis.yml | 90 ++++++++++++++++++++++++++--------------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/.travis.yml b/.travis.yml index 635a27e51..a091719cd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,50 +3,50 @@ dist: xenial matrix: include: - - os: windows - language: sh - env: PYTHON_ROOT="/c/Python37" PYTHON_CHOCO_PKG="python3" - - os: windows - language: sh - env: PYTHON_ROOT="/c/Python27" PYTHON_CHOCO_PKG="python2" - - os: linux - dist: trusty - python: "pypy3" - - os: linux - python: 3.7 - - os: linux - python: 3.6 - - os: linux - python: 3.5 - - os: linux - python: 2.7 - - os: linux - # The PROJECT environment variable refers to a downstream project that - # depends on cloudpickle (for example: distributed, joblib, loky). For - # each project, a matrix item is created, that will run the $PROJECT - # test suite with the latest cloudpickle, to check for breaking changes - # introduced by cloudpickle. - # Side note: for distributed, the pytest major version is constrained to - # 3 because running it's test suite with pytest 4 fails for now. Also, - # two failing tests related to openssl and not to cloudpickle are - # skipped - python: 3.7 - sudo: required - env: PROJECT=distributed - TEST_REQUIREMENTS="pytest==3.6 numpy pandas mock bokeh" - PROJECT_URL=https://github.com/dask/distributed.git - PYTEST_ARGS="-k not test_connection_args and not test_listen_args" - if: commit_message =~ /(\[ci downstream\]|\[ci distributed\])/ - - os: linux - env: PROJECT=loky TEST_REQUIREMENTS="pytest psutil" - PROJECT_URL=https://github.com/tomMoral/loky.git - python: 3.7 - if: commit_message =~ /(\[ci downstream\]|\[ci loky\])/ - - os: linux - env: PROJECT=joblib TEST_REQUIREMENTS="pytest numpy distributed" - PROJECT_URL=https://github.com/joblib/joblib.git - python: 3.7 - if: commit_message =~ /(\[ci downstream\]|\[ci joblib\])/ + # - os: windows + # language: sh + # env: PYTHON_ROOT="/c/Python37" PYTHON_CHOCO_PKG="python3" + # - os: windows + # language: sh + # env: PYTHON_ROOT="/c/Python27" PYTHON_CHOCO_PKG="python2" + # - os: linux + # dist: trusty + # python: "pypy3" + # - os: linux + # python: 3.7 + # - os: linux + # python: 3.6 + # - os: linux + # python: 3.5 + # - os: linux + # python: 2.7 + # - os: linux + # # The PROJECT environment variable refers to a downstream project that + # # depends on cloudpickle (for example: distributed, joblib, loky). For + # # each project, a matrix item is created, that will run the $PROJECT + # # test suite with the latest cloudpickle, to check for breaking changes + # # introduced by cloudpickle. + # # Side note: for distributed, the pytest major version is constrained to + # # 3 because running it's test suite with pytest 4 fails for now. Also, + # # two failing tests related to openssl and not to cloudpickle are + # # skipped + # python: 3.7 + # sudo: required + # env: PROJECT=distributed + # TEST_REQUIREMENTS="pytest==3.6 numpy pandas mock bokeh" + # PROJECT_URL=https://github.com/dask/distributed.git + # PYTEST_ARGS="-k not test_connection_args and not test_listen_args" + # if: commit_message =~ /(\[ci downstream\]|\[ci distributed\])/ + # - os: linux + # env: PROJECT=loky TEST_REQUIREMENTS="pytest psutil" + # PROJECT_URL=https://github.com/tomMoral/loky.git + # python: 3.7 + # if: commit_message =~ /(\[ci downstream\]|\[ci loky\])/ + # - os: linux + # env: PROJECT=joblib TEST_REQUIREMENTS="pytest numpy distributed" + # PROJECT_URL=https://github.com/joblib/joblib.git + # python: 3.7 + # if: commit_message =~ /(\[ci downstream\]|\[ci joblib\])/ - os: linux env: PROJECT=ray TEST_REQUIREMENTS="setproctitle hypothesis" PROJECT_URL=https://github.com/ray-project/ray.git @@ -110,7 +110,7 @@ script: if [[ "$TEST_RETURN_CODE" != "0" ]]; then exit $TEST_RETURN_CODE fi - popd + # popd fi after_success: - coverage combine --append From 394785e923727580414236ff27b6b9c6dd45f6ac Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Fri, 15 Feb 2019 11:03:03 -0800 Subject: [PATCH 44/89] add psutil to dependencies for ray --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a091719cd..7f23ba36e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,7 +48,7 @@ matrix: # python: 3.7 # if: commit_message =~ /(\[ci downstream\]|\[ci joblib\])/ - os: linux - env: PROJECT=ray TEST_REQUIREMENTS="setproctitle hypothesis" + env: PROJECT=ray TEST_REQUIREMENTS="setproctitle hypothesis psutil" PROJECT_URL=https://github.com/ray-project/ray.git PYTEST_ARGS="--duration=10" python: 3.5 From 0a6611bc27dc9cb6a3dede26f7d28fc9082a216d Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Fri, 15 Feb 2019 22:08:10 -0800 Subject: [PATCH 45/89] Undo removal of popd --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7f23ba36e..9eb1b74c3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -110,7 +110,7 @@ script: if [[ "$TEST_RETURN_CODE" != "0" ]]; then exit $TEST_RETURN_CODE fi - # popd + popd fi after_success: - coverage combine --append From e5bd30c2dfcd9ceb0161da50f252a76092d817f8 Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Sun, 17 Feb 2019 14:19:18 -0800 Subject: [PATCH 46/89] Add other tests back in --- .travis.yml | 88 ++++++++++++++++++++++++++--------------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9eb1b74c3..ca93b986b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,50 +3,50 @@ dist: xenial matrix: include: - # - os: windows - # language: sh - # env: PYTHON_ROOT="/c/Python37" PYTHON_CHOCO_PKG="python3" - # - os: windows - # language: sh - # env: PYTHON_ROOT="/c/Python27" PYTHON_CHOCO_PKG="python2" - # - os: linux - # dist: trusty - # python: "pypy3" - # - os: linux - # python: 3.7 - # - os: linux - # python: 3.6 - # - os: linux - # python: 3.5 - # - os: linux - # python: 2.7 - # - os: linux - # # The PROJECT environment variable refers to a downstream project that - # # depends on cloudpickle (for example: distributed, joblib, loky). For - # # each project, a matrix item is created, that will run the $PROJECT - # # test suite with the latest cloudpickle, to check for breaking changes - # # introduced by cloudpickle. - # # Side note: for distributed, the pytest major version is constrained to - # # 3 because running it's test suite with pytest 4 fails for now. Also, - # # two failing tests related to openssl and not to cloudpickle are - # # skipped - # python: 3.7 - # sudo: required - # env: PROJECT=distributed - # TEST_REQUIREMENTS="pytest==3.6 numpy pandas mock bokeh" - # PROJECT_URL=https://github.com/dask/distributed.git - # PYTEST_ARGS="-k not test_connection_args and not test_listen_args" - # if: commit_message =~ /(\[ci downstream\]|\[ci distributed\])/ - # - os: linux - # env: PROJECT=loky TEST_REQUIREMENTS="pytest psutil" - # PROJECT_URL=https://github.com/tomMoral/loky.git - # python: 3.7 - # if: commit_message =~ /(\[ci downstream\]|\[ci loky\])/ - # - os: linux - # env: PROJECT=joblib TEST_REQUIREMENTS="pytest numpy distributed" - # PROJECT_URL=https://github.com/joblib/joblib.git - # python: 3.7 - # if: commit_message =~ /(\[ci downstream\]|\[ci joblib\])/ + - os: windows + language: sh + env: PYTHON_ROOT="/c/Python37" PYTHON_CHOCO_PKG="python3" + - os: windows + language: sh + env: PYTHON_ROOT="/c/Python27" PYTHON_CHOCO_PKG="python2" + - os: linux + dist: trusty + python: "pypy3" + - os: linux + python: 3.7 + - os: linux + python: 3.6 + - os: linux + python: 3.5 + - os: linux + python: 2.7 + - os: linux + # The PROJECT environment variable refers to a downstream project that + # depends on cloudpickle (for example: distributed, joblib, loky). For + # each project, a matrix item is created, that will run the $PROJECT + # test suite with the latest cloudpickle, to check for breaking changes + # introduced by cloudpickle. + # Side note: for distributed, the pytest major version is constrained to + # 3 because running it's test suite with pytest 4 fails for now. Also, + # two failing tests related to openssl and not to cloudpickle are + # skipped + python: 3.7 + sudo: required + env: PROJECT=distributed + TEST_REQUIREMENTS="pytest==3.6 numpy pandas mock bokeh" + PROJECT_URL=https://github.com/dask/distributed.git + PYTEST_ARGS="-k not test_connection_args and not test_listen_args" + if: commit_message =~ /(\[ci downstream\]|\[ci distributed\])/ + - os: linux + env: PROJECT=loky TEST_REQUIREMENTS="pytest psutil" + PROJECT_URL=https://github.com/tomMoral/loky.git + python: 3.7 + if: commit_message =~ /(\[ci downstream\]|\[ci loky\])/ + - os: linux + env: PROJECT=joblib TEST_REQUIREMENTS="pytest numpy distributed" + PROJECT_URL=https://github.com/joblib/joblib.git + python: 3.7 + if: commit_message =~ /(\[ci downstream\]|\[ci joblib\])/ - os: linux env: PROJECT=ray TEST_REQUIREMENTS="setproctitle hypothesis psutil" PROJECT_URL=https://github.com/ray-project/ray.git From fdefa9912bcf76779af60904a78dabdff8b49fa1 Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Mon, 25 Feb 2019 12:49:08 -0800 Subject: [PATCH 47/89] Install from wheels --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ca93b986b..5b6ea3bed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,7 +51,8 @@ matrix: env: PROJECT=ray TEST_REQUIREMENTS="setproctitle hypothesis psutil" PROJECT_URL=https://github.com/ray-project/ray.git PYTEST_ARGS="--duration=10" - python: 3.5 + if: commit_message =~ /(\[ci downstream\]|\[ci ray\])/ + python: 3.7 before_install: - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then @@ -69,7 +70,8 @@ install: - if [[ $PROJECT != "" ]]; then pip install $TEST_REQUIREMENTS; if [[ $PROJECT == "ray" ]]; then - pip install ray; + wget https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.7.0.dev0-cp37-cp37m-manylinux1_x86_64.whl -O ray.whl + pip install ray.whl PROJECT_DIR="$(python -c "import os,ray,sys;print(os.path.dirname(ray.__file__));sys.stdout.flush()")"; rm $PROJECT_DIR/cloudpickle/cloudpickle.py; cp cloudpickle/cloudpickle.py $PROJECT_DIR/cloudpickle/cloudpickle.py; From 3233084b924979a529a3bab04d8fce788d018b0d Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Mon, 25 Feb 2019 12:50:12 -0800 Subject: [PATCH 48/89] Always test ray for now --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5b6ea3bed..e53ebc7bd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,7 +51,6 @@ matrix: env: PROJECT=ray TEST_REQUIREMENTS="setproctitle hypothesis psutil" PROJECT_URL=https://github.com/ray-project/ray.git PYTEST_ARGS="--duration=10" - if: commit_message =~ /(\[ci downstream\]|\[ci ray\])/ python: 3.7 before_install: From 2f690b397fa4ad70366a532fa37b09343667b747 Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Mon, 25 Feb 2019 12:59:45 -0800 Subject: [PATCH 49/89] Syntax error --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e53ebc7bd..949ffa59b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -69,8 +69,8 @@ install: - if [[ $PROJECT != "" ]]; then pip install $TEST_REQUIREMENTS; if [[ $PROJECT == "ray" ]]; then - wget https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.7.0.dev0-cp37-cp37m-manylinux1_x86_64.whl -O ray.whl - pip install ray.whl + wget https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.7.0.dev0-cp37-cp37m-manylinux1_x86_64.whl -O ray.whl; + pip install ray.whl; PROJECT_DIR="$(python -c "import os,ray,sys;print(os.path.dirname(ray.__file__));sys.stdout.flush()")"; rm $PROJECT_DIR/cloudpickle/cloudpickle.py; cp cloudpickle/cloudpickle.py $PROJECT_DIR/cloudpickle/cloudpickle.py; From 152d06342faae367769ca6e58cce389748156b2b Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Mon, 25 Feb 2019 16:00:24 -0800 Subject: [PATCH 50/89] Rename file --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 949ffa59b..9bdf60a09 100644 --- a/.travis.yml +++ b/.travis.yml @@ -69,8 +69,8 @@ install: - if [[ $PROJECT != "" ]]; then pip install $TEST_REQUIREMENTS; if [[ $PROJECT == "ray" ]]; then - wget https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.7.0.dev0-cp37-cp37m-manylinux1_x86_64.whl -O ray.whl; - pip install ray.whl; + wget https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.7.0.dev0-cp37-cp37m-manylinux1_x86_64.whl; + pip install ray-0.7.0.dev0-cp37-cp37m-manylinux1_x86_64.whl; PROJECT_DIR="$(python -c "import os,ray,sys;print(os.path.dirname(ray.__file__));sys.stdout.flush()")"; rm $PROJECT_DIR/cloudpickle/cloudpickle.py; cp cloudpickle/cloudpickle.py $PROJECT_DIR/cloudpickle/cloudpickle.py; From 0fd87a28bc3b475184d47268b26f209f4fd9f481 Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Mon, 25 Feb 2019 16:33:47 -0800 Subject: [PATCH 51/89] Install ray from pypi --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9bdf60a09..5e8be3e76 100644 --- a/.travis.yml +++ b/.travis.yml @@ -69,8 +69,7 @@ install: - if [[ $PROJECT != "" ]]; then pip install $TEST_REQUIREMENTS; if [[ $PROJECT == "ray" ]]; then - wget https://s3-us-west-2.amazonaws.com/ray-wheels/latest/ray-0.7.0.dev0-cp37-cp37m-manylinux1_x86_64.whl; - pip install ray-0.7.0.dev0-cp37-cp37m-manylinux1_x86_64.whl; + pip install ray; PROJECT_DIR="$(python -c "import os,ray,sys;print(os.path.dirname(ray.__file__));sys.stdout.flush()")"; rm $PROJECT_DIR/cloudpickle/cloudpickle.py; cp cloudpickle/cloudpickle.py $PROJECT_DIR/cloudpickle/cloudpickle.py; From e0c1a337c29edcc82ea1275b7a769795f3a660be Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Thu, 7 Mar 2019 15:02:41 -0800 Subject: [PATCH 52/89] Update test directory --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5e8be3e76..722a98b8a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -73,7 +73,7 @@ install: PROJECT_DIR="$(python -c "import os,ray,sys;print(os.path.dirname(ray.__file__));sys.stdout.flush()")"; rm $PROJECT_DIR/cloudpickle/cloudpickle.py; cp cloudpickle/cloudpickle.py $PROJECT_DIR/cloudpickle/cloudpickle.py; - PROJECT_DIR="$PROJECT_DIR/test"; + PROJECT_DIR="$PROJECT_DIR/tests"; else pushd ..; PROJECT_DIR="../$PROJECT"; From c5cca546df06e0baf75f25d23931df38f663fa8c Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Mon, 11 Mar 2019 15:32:24 -0700 Subject: [PATCH 53/89] Add required packages --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 722a98b8a..fa6dc7adf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,9 +48,9 @@ matrix: python: 3.7 if: commit_message =~ /(\[ci downstream\]|\[ci joblib\])/ - os: linux - env: PROJECT=ray TEST_REQUIREMENTS="setproctitle hypothesis psutil" + env: PROJECT=ray TEST_REQUIREMENTS="setproctitle hypothesis psutil flaky networkx tensorflow" PROJECT_URL=https://github.com/ray-project/ray.git - PYTEST_ARGS="--duration=10" + PYTEST_ARGS="--duration=10 --ignore=test_cython.py" python: 3.7 before_install: From cd6ddafe5a93c42e8c13b56b68bc3e0572050a5f Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Mon, 11 Mar 2019 15:32:50 -0700 Subject: [PATCH 54/89] Skip other tests temporarily --- .travis.yml | 88 ++++++++++++++++++++++++++--------------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/.travis.yml b/.travis.yml index fa6dc7adf..bfe359761 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,50 +3,50 @@ dist: xenial matrix: include: - - os: windows - language: sh - env: PYTHON_ROOT="/c/Python37" PYTHON_CHOCO_PKG="python3" - - os: windows - language: sh - env: PYTHON_ROOT="/c/Python27" PYTHON_CHOCO_PKG="python2" - - os: linux - dist: trusty - python: "pypy3" - - os: linux - python: 3.7 - - os: linux - python: 3.6 - - os: linux - python: 3.5 - - os: linux - python: 2.7 - - os: linux - # The PROJECT environment variable refers to a downstream project that - # depends on cloudpickle (for example: distributed, joblib, loky). For - # each project, a matrix item is created, that will run the $PROJECT - # test suite with the latest cloudpickle, to check for breaking changes - # introduced by cloudpickle. - # Side note: for distributed, the pytest major version is constrained to - # 3 because running it's test suite with pytest 4 fails for now. Also, - # two failing tests related to openssl and not to cloudpickle are - # skipped - python: 3.7 - sudo: required - env: PROJECT=distributed - TEST_REQUIREMENTS="pytest==3.6 numpy pandas mock bokeh" - PROJECT_URL=https://github.com/dask/distributed.git - PYTEST_ARGS="-k not test_connection_args and not test_listen_args" - if: commit_message =~ /(\[ci downstream\]|\[ci distributed\])/ - - os: linux - env: PROJECT=loky TEST_REQUIREMENTS="pytest psutil" - PROJECT_URL=https://github.com/tomMoral/loky.git - python: 3.7 - if: commit_message =~ /(\[ci downstream\]|\[ci loky\])/ - - os: linux - env: PROJECT=joblib TEST_REQUIREMENTS="pytest numpy distributed" - PROJECT_URL=https://github.com/joblib/joblib.git - python: 3.7 - if: commit_message =~ /(\[ci downstream\]|\[ci joblib\])/ + # - os: windows + # language: sh + # env: PYTHON_ROOT="/c/Python37" PYTHON_CHOCO_PKG="python3" + # - os: windows + # language: sh + # env: PYTHON_ROOT="/c/Python27" PYTHON_CHOCO_PKG="python2" + # - os: linux + # dist: trusty + # python: "pypy3" + # - os: linux + # python: 3.7 + # - os: linux + # python: 3.6 + # - os: linux + # python: 3.5 + # - os: linux + # python: 2.7 + # - os: linux + # # The PROJECT environment variable refers to a downstream project that + # # depends on cloudpickle (for example: distributed, joblib, loky). For + # # each project, a matrix item is created, that will run the $PROJECT + # # test suite with the latest cloudpickle, to check for breaking changes + # # introduced by cloudpickle. + # # Side note: for distributed, the pytest major version is constrained to + # # 3 because running it's test suite with pytest 4 fails for now. Also, + # # two failing tests related to openssl and not to cloudpickle are + # # skipped + # python: 3.7 + # sudo: required + # env: PROJECT=distributed + # TEST_REQUIREMENTS="pytest==3.6 numpy pandas mock bokeh" + # PROJECT_URL=https://github.com/dask/distributed.git + # PYTEST_ARGS="-k not test_connection_args and not test_listen_args" + # if: commit_message =~ /(\[ci downstream\]|\[ci distributed\])/ + # - os: linux + # env: PROJECT=loky TEST_REQUIREMENTS="pytest psutil" + # PROJECT_URL=https://github.com/tomMoral/loky.git + # python: 3.7 + # if: commit_message =~ /(\[ci downstream\]|\[ci loky\])/ + # - os: linux + # env: PROJECT=joblib TEST_REQUIREMENTS="pytest numpy distributed" + # PROJECT_URL=https://github.com/joblib/joblib.git + # python: 3.7 + # if: commit_message =~ /(\[ci downstream\]|\[ci joblib\])/ - os: linux env: PROJECT=ray TEST_REQUIREMENTS="setproctitle hypothesis psutil flaky networkx tensorflow" PROJECT_URL=https://github.com/ray-project/ray.git From 8527d1da17560f4397afdb889cadced1cc31ecc2 Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Mon, 11 Mar 2019 15:36:45 -0700 Subject: [PATCH 55/89] Remove duration argument --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bfe359761..0871f7194 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,7 +50,7 @@ matrix: - os: linux env: PROJECT=ray TEST_REQUIREMENTS="setproctitle hypothesis psutil flaky networkx tensorflow" PROJECT_URL=https://github.com/ray-project/ray.git - PYTEST_ARGS="--duration=10 --ignore=test_cython.py" + PYTEST_ARGS="--ignore=test_cython.py" python: 3.7 before_install: From 1fed7dee54f88513b8341b5742c7318f69441dee Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Mon, 11 Mar 2019 15:39:22 -0700 Subject: [PATCH 56/89] Add duration back in --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0871f7194..e60bf650d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,7 +50,7 @@ matrix: - os: linux env: PROJECT=ray TEST_REQUIREMENTS="setproctitle hypothesis psutil flaky networkx tensorflow" PROJECT_URL=https://github.com/ray-project/ray.git - PYTEST_ARGS="--ignore=test_cython.py" + PYTEST_ARGS="--ignore=test_cython.py --duration=10" python: 3.7 before_install: From 6c7e89ceaaf8eaee9bbb7f80caa4d41cff5da61c Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Mon, 11 Mar 2019 15:42:44 -0700 Subject: [PATCH 57/89] trigger travis build --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index e60bf650d..b4ef67019 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,9 +3,9 @@ dist: xenial matrix: include: - # - os: windows - # language: sh - # env: PYTHON_ROOT="/c/Python37" PYTHON_CHOCO_PKG="python3" + - os: windows + language: sh + env: PYTHON_ROOT="/c/Python37" PYTHON_CHOCO_PKG="python3" # - os: windows # language: sh # env: PYTHON_ROOT="/c/Python27" PYTHON_CHOCO_PKG="python2" From c4c6dc510c8cc7c6de37030efbfa4f9e8ce8bd94 Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Mon, 11 Mar 2019 15:47:51 -0700 Subject: [PATCH 58/89] Add extra white space to separate arguments? --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b4ef67019..43113ecc4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,7 +50,7 @@ matrix: - os: linux env: PROJECT=ray TEST_REQUIREMENTS="setproctitle hypothesis psutil flaky networkx tensorflow" PROJECT_URL=https://github.com/ray-project/ray.git - PYTEST_ARGS="--ignore=test_cython.py --duration=10" + PYTEST_ARGS="--ignore=test_cython.py --duration=10" python: 3.7 before_install: From a56116187be6dc17331c24dfab14ca33f0b6fa0a Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Mon, 11 Mar 2019 15:51:34 -0700 Subject: [PATCH 59/89] Remove test_cython instead of trying to get cython to ignore it --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 43113ecc4..6807bd72b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,7 +50,7 @@ matrix: - os: linux env: PROJECT=ray TEST_REQUIREMENTS="setproctitle hypothesis psutil flaky networkx tensorflow" PROJECT_URL=https://github.com/ray-project/ray.git - PYTEST_ARGS="--ignore=test_cython.py --duration=10" + PYTEST_ARGS="--duration=10" python: 3.7 before_install: @@ -74,6 +74,7 @@ install: rm $PROJECT_DIR/cloudpickle/cloudpickle.py; cp cloudpickle/cloudpickle.py $PROJECT_DIR/cloudpickle/cloudpickle.py; PROJECT_DIR="$PROJECT_DIR/tests"; + rm $PROJECT_DIR/test_cython.py; else pushd ..; PROJECT_DIR="../$PROJECT"; From 2a6cc21424fcdc6a03a1c217f0760dd57b2ebc9c Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Mon, 11 Mar 2019 15:55:19 -0700 Subject: [PATCH 60/89] Add other test back in (ci ray) --- .travis.yml | 82 ++++++++++++++++++++++++++--------------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6807bd72b..936697488 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,47 +6,47 @@ matrix: - os: windows language: sh env: PYTHON_ROOT="/c/Python37" PYTHON_CHOCO_PKG="python3" - # - os: windows - # language: sh - # env: PYTHON_ROOT="/c/Python27" PYTHON_CHOCO_PKG="python2" - # - os: linux - # dist: trusty - # python: "pypy3" - # - os: linux - # python: 3.7 - # - os: linux - # python: 3.6 - # - os: linux - # python: 3.5 - # - os: linux - # python: 2.7 - # - os: linux - # # The PROJECT environment variable refers to a downstream project that - # # depends on cloudpickle (for example: distributed, joblib, loky). For - # # each project, a matrix item is created, that will run the $PROJECT - # # test suite with the latest cloudpickle, to check for breaking changes - # # introduced by cloudpickle. - # # Side note: for distributed, the pytest major version is constrained to - # # 3 because running it's test suite with pytest 4 fails for now. Also, - # # two failing tests related to openssl and not to cloudpickle are - # # skipped - # python: 3.7 - # sudo: required - # env: PROJECT=distributed - # TEST_REQUIREMENTS="pytest==3.6 numpy pandas mock bokeh" - # PROJECT_URL=https://github.com/dask/distributed.git - # PYTEST_ARGS="-k not test_connection_args and not test_listen_args" - # if: commit_message =~ /(\[ci downstream\]|\[ci distributed\])/ - # - os: linux - # env: PROJECT=loky TEST_REQUIREMENTS="pytest psutil" - # PROJECT_URL=https://github.com/tomMoral/loky.git - # python: 3.7 - # if: commit_message =~ /(\[ci downstream\]|\[ci loky\])/ - # - os: linux - # env: PROJECT=joblib TEST_REQUIREMENTS="pytest numpy distributed" - # PROJECT_URL=https://github.com/joblib/joblib.git - # python: 3.7 - # if: commit_message =~ /(\[ci downstream\]|\[ci joblib\])/ + - os: windows + language: sh + env: PYTHON_ROOT="/c/Python27" PYTHON_CHOCO_PKG="python2" + - os: linux + dist: trusty + python: "pypy3" + - os: linux + python: 3.7 + - os: linux + python: 3.6 + - os: linux + python: 3.5 + - os: linux + python: 2.7 + - os: linux + # The PROJECT environment variable refers to a downstream project that + # depends on cloudpickle (for example: distributed, joblib, loky). For + # each project, a matrix item is created, that will run the $PROJECT + # test suite with the latest cloudpickle, to check for breaking changes + # introduced by cloudpickle. + # Side note: for distributed, the pytest major version is constrained to + # 3 because running it's test suite with pytest 4 fails for now. Also, + # two failing tests related to openssl and not to cloudpickle are + # skipped + python: 3.7 + sudo: required + env: PROJECT=distributed + TEST_REQUIREMENTS="pytest==3.6 numpy pandas mock bokeh" + PROJECT_URL=https://github.com/dask/distributed.git + PYTEST_ARGS="-k not test_connection_args and not test_listen_args" + if: commit_message =~ /(\[ci downstream\]|\[ci distributed\])/ + - os: linux + env: PROJECT=loky TEST_REQUIREMENTS="pytest psutil" + PROJECT_URL=https://github.com/tomMoral/loky.git + python: 3.7 + if: commit_message =~ /(\[ci downstream\]|\[ci loky\])/ + - os: linux + env: PROJECT=joblib TEST_REQUIREMENTS="pytest numpy distributed" + PROJECT_URL=https://github.com/joblib/joblib.git + python: 3.7 + if: commit_message =~ /(\[ci downstream\]|\[ci joblib\])/ - os: linux env: PROJECT=ray TEST_REQUIREMENTS="setproctitle hypothesis psutil flaky networkx tensorflow" PROJECT_URL=https://github.com/ray-project/ray.git From b8eca80e36e69529e33c774d2cf313e2801894bd Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Mon, 11 Mar 2019 15:59:55 -0700 Subject: [PATCH 61/89] change to match other format [ci downstream] --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 936697488..6d12c8e9d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -52,6 +52,7 @@ matrix: PROJECT_URL=https://github.com/ray-project/ray.git PYTEST_ARGS="--duration=10" python: 3.7 + if: commit_message =~ /(\[ci downstream\]|\[ci ray\])/ before_install: - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then From 9a5480755a0dd1560630122987beb934dccffb0a Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Mon, 11 Mar 2019 16:08:37 -0700 Subject: [PATCH 62/89] Install cython_examples instead of removing the test [ci downstream] --- .travis.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6d12c8e9d..a98f677ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,7 +48,7 @@ matrix: python: 3.7 if: commit_message =~ /(\[ci downstream\]|\[ci joblib\])/ - os: linux - env: PROJECT=ray TEST_REQUIREMENTS="setproctitle hypothesis psutil flaky networkx tensorflow" + env: PROJECT=ray TEST_REQUIREMENTS="setproctitle hypothesis psutil flaky networkx tensorflow scipy" PROJECT_URL=https://github.com/ray-project/ray.git PYTEST_ARGS="--duration=10" python: 3.7 @@ -70,12 +70,21 @@ install: - if [[ $PROJECT != "" ]]; then pip install $TEST_REQUIREMENTS; if [[ $PROJECT == "ray" ]]; then + # Install cython_examples + pushd ..; + git clone $PROJECT_URL; + pushd ray/examples/cython; + pip install -e .; + popd; + rm -rf ray; + popd; + + # Install ray pip install ray; PROJECT_DIR="$(python -c "import os,ray,sys;print(os.path.dirname(ray.__file__));sys.stdout.flush()")"; rm $PROJECT_DIR/cloudpickle/cloudpickle.py; cp cloudpickle/cloudpickle.py $PROJECT_DIR/cloudpickle/cloudpickle.py; PROJECT_DIR="$PROJECT_DIR/tests"; - rm $PROJECT_DIR/test_cython.py; else pushd ..; PROJECT_DIR="../$PROJECT"; From 25d7794d69e5e1ff50a951efcabb744b8a0d9a72 Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Mon, 11 Mar 2019 16:12:10 -0700 Subject: [PATCH 63/89] Fix pip install -e . command [ci downstream] --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a98f677ac..0b266e11f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -74,7 +74,7 @@ install: pushd ..; git clone $PROJECT_URL; pushd ray/examples/cython; - pip install -e .; + pip install -e . ; popd; rm -rf ray; popd; From cc48a5a967186858768bb925aaeaa3a679d90013 Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Mon, 11 Mar 2019 16:14:33 -0700 Subject: [PATCH 64/89] Another fix for pip install command [ci downstream] --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0b266e11f..fa5c39008 100644 --- a/.travis.yml +++ b/.travis.yml @@ -74,11 +74,10 @@ install: pushd ..; git clone $PROJECT_URL; pushd ray/examples/cython; - pip install -e . ; + pip install -e ./; popd; rm -rf ray; popd; - # Install ray pip install ray; PROJECT_DIR="$(python -c "import os,ray,sys;print(os.path.dirname(ray.__file__));sys.stdout.flush()")"; From 2323726a5addac6d1d35120bf9ea8012ba18f41f Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Mon, 11 Mar 2019 16:16:09 -0700 Subject: [PATCH 65/89] Use python setup.py instead [ci downstream] --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fa5c39008..596096bbe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -74,7 +74,7 @@ install: pushd ..; git clone $PROJECT_URL; pushd ray/examples/cython; - pip install -e ./; + python setup.py install; popd; rm -rf ray; popd; From 20bd3f10ac70235bd8d2ccefd6cfd2f2eaa3376e Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Mon, 11 Mar 2019 16:17:54 -0700 Subject: [PATCH 66/89] Remove comments [ci downstream] --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 596096bbe..4b18e399a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -70,15 +70,13 @@ install: - if [[ $PROJECT != "" ]]; then pip install $TEST_REQUIREMENTS; if [[ $PROJECT == "ray" ]]; then - # Install cython_examples pushd ..; git clone $PROJECT_URL; pushd ray/examples/cython; python setup.py install; popd; - rm -rf ray; + rm -rf ray/; popd; - # Install ray pip install ray; PROJECT_DIR="$(python -c "import os,ray,sys;print(os.path.dirname(ray.__file__));sys.stdout.flush()")"; rm $PROJECT_DIR/cloudpickle/cloudpickle.py; From b2d23bd86913a7575fac8e82098bf4d58ea8048f Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Mon, 11 Mar 2019 16:21:21 -0700 Subject: [PATCH 67/89] Add cython requirement for ray [ci downstream] --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4b18e399a..555516e8e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,7 +48,7 @@ matrix: python: 3.7 if: commit_message =~ /(\[ci downstream\]|\[ci joblib\])/ - os: linux - env: PROJECT=ray TEST_REQUIREMENTS="setproctitle hypothesis psutil flaky networkx tensorflow scipy" + env: PROJECT=ray TEST_REQUIREMENTS="setproctitle hypothesis psutil flaky networkx tensorflow scipy Cython==0.29" PROJECT_URL=https://github.com/ray-project/ray.git PYTEST_ARGS="--duration=10" python: 3.7 From 898706419137f4be94d083b040251904e0e4bade Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Mon, 11 Mar 2019 18:07:18 -0700 Subject: [PATCH 68/89] Resolve comments [ci ray] --- .travis.yml | 49 ++++++++++++++++++++++++------------------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/.travis.yml b/.travis.yml index 555516e8e..cce1034a1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,11 +48,25 @@ matrix: python: 3.7 if: commit_message =~ /(\[ci downstream\]|\[ci joblib\])/ - os: linux - env: PROJECT=ray TEST_REQUIREMENTS="setproctitle hypothesis psutil flaky networkx tensorflow scipy Cython==0.29" + env: PROJECT=ray TEST_REQUIREMENTS="setproctitle hypothesis psutil" PROJECT_URL=https://github.com/ray-project/ray.git - PYTEST_ARGS="--duration=10" + PYTEST_ARGS="--duration=10 -k test_mini or test_basic" python: 3.7 if: commit_message =~ /(\[ci downstream\]|\[ci ray\])/ + install: + - pip install . + - pip install --upgrade -r dev-requirements.txt + - pip install tornado + - if [[ $TRAVIS_PYTHON_VERSION != 'pypy'* ]]; then + pip install numpy scipy; + fi + - pip install $TEST_REQUIREMENTS; + - pip install ray==0.6.4; + - PROJECT_DIR="$(python -c "import os,ray,sys;print(os.path.dirname(ray.__file__));sys.stdout.flush()")"; + - rm $PROJECT_DIR/cloudpickle/cloudpickle.py; + - cp cloudpickle/cloudpickle.py $PROJECT_DIR/cloudpickle/cloudpickle.py; + - PROJECT_DIR="$PROJECT_DIR/tests"; + - pip list before_install: - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then @@ -69,31 +83,16 @@ install: fi - if [[ $PROJECT != "" ]]; then pip install $TEST_REQUIREMENTS; - if [[ $PROJECT == "ray" ]]; then - pushd ..; - git clone $PROJECT_URL; - pushd ray/examples/cython; - python setup.py install; - popd; - rm -rf ray/; - popd; - pip install ray; - PROJECT_DIR="$(python -c "import os,ray,sys;print(os.path.dirname(ray.__file__));sys.stdout.flush()")"; - rm $PROJECT_DIR/cloudpickle/cloudpickle.py; - cp cloudpickle/cloudpickle.py $PROJECT_DIR/cloudpickle/cloudpickle.py; - PROJECT_DIR="$PROJECT_DIR/tests"; - else - pushd ..; - PROJECT_DIR="../$PROJECT"; - git clone $PROJECT_URL; - if [[ $PROJECT == "joblib" ]]; then - pushd joblib/joblib/externals; - source vendor_cloudpickle.sh ../../../cloudpickle; - popd; - fi; - pip install ./$PROJECT; + pushd ..; + PROJECT_DIR="../$PROJECT"; + git clone $PROJECT_URL; + if [[ $PROJECT == "joblib" ]]; then + pushd joblib/joblib/externals; + source vendor_cloudpickle.sh ../../../cloudpickle; popd; fi; + pip install ./$PROJECT; + popd; fi - pip list before_script: From 1e7c37138dd7cc016a962a172634726282c0c438 Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Mon, 11 Mar 2019 18:14:37 -0700 Subject: [PATCH 69/89] Give ray its own script build process [ci ray] --- .travis.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cce1034a1..982eaa310 100644 --- a/.travis.yml +++ b/.travis.yml @@ -67,6 +67,15 @@ matrix: - cp cloudpickle/cloudpickle.py $PROJECT_DIR/cloudpickle/cloudpickle.py; - PROJECT_DIR="$PROJECT_DIR/tests"; - pip list + script: + - COVERAGE_PROCESS_START="$TRAVIS_BUILD_DIR/.coveragerc" PYTHONPATH='.:tests' pytest -r s + - pushd $PROJECT_DIR + - pytest -vl --duration=10 $PROJECT_DIR/test_mini.py $PROJECT_DIR/test_basic.py + - TEST_RETURN_CODE=$? + - if [[ "$TEST_RETURN_CODE" != "0" ]]; then + exit $TEST_RETURN_CODE + fi + - popd before_install: - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then @@ -105,7 +114,7 @@ script: - COVERAGE_PROCESS_START="$TRAVIS_BUILD_DIR/.coveragerc" PYTHONPATH='.:tests' pytest -r s - | if [[ $PROJECT != "" ]]; then - pushd $PROJECT_DIR + pushd "../$PROJECT" # pytest hangs if given an empty quoted string (it will happen # if PYTEST_ARGS was not defined) so we have to split the cases. if [[ "$PYTEST_ARGS" != "" ]]; then From 8c5ee1575e7f186f2f25f548fd87b5d758622859 Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Mon, 11 Mar 2019 18:21:17 -0700 Subject: [PATCH 70/89] Undo unnecessary changes [ci ray] --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 982eaa310..48fd9524c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -93,7 +93,6 @@ install: - if [[ $PROJECT != "" ]]; then pip install $TEST_REQUIREMENTS; pushd ..; - PROJECT_DIR="../$PROJECT"; git clone $PROJECT_URL; if [[ $PROJECT == "joblib" ]]; then pushd joblib/joblib/externals; @@ -114,7 +113,7 @@ script: - COVERAGE_PROCESS_START="$TRAVIS_BUILD_DIR/.coveragerc" PYTHONPATH='.:tests' pytest -r s - | if [[ $PROJECT != "" ]]; then - pushd "../$PROJECT" + pushd ../$PROJECT # pytest hangs if given an empty quoted string (it will happen # if PYTEST_ARGS was not defined) so we have to split the cases. if [[ "$PYTEST_ARGS" != "" ]]; then @@ -123,10 +122,10 @@ script: pytest -vl fi TEST_RETURN_CODE=$? + popd if [[ "$TEST_RETURN_CODE" != "0" ]]; then exit $TEST_RETURN_CODE fi - popd fi after_success: - coverage combine --append From 052063a0e37f03396be4b4c54b6612e2e6a73ca4 Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Wed, 13 Mar 2019 09:52:32 -0700 Subject: [PATCH 71/89] Resolve comments [ci ray] --- .travis.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 48fd9524c..2b6db071a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,9 +48,7 @@ matrix: python: 3.7 if: commit_message =~ /(\[ci downstream\]|\[ci joblib\])/ - os: linux - env: PROJECT=ray TEST_REQUIREMENTS="setproctitle hypothesis psutil" - PROJECT_URL=https://github.com/ray-project/ray.git - PYTEST_ARGS="--duration=10 -k test_mini or test_basic" + env: PROJECT=ray TEST_REQUIREMENTS="setproctitle psutil" python: 3.7 if: commit_message =~ /(\[ci downstream\]|\[ci ray\])/ install: @@ -70,7 +68,7 @@ matrix: script: - COVERAGE_PROCESS_START="$TRAVIS_BUILD_DIR/.coveragerc" PYTHONPATH='.:tests' pytest -r s - pushd $PROJECT_DIR - - pytest -vl --duration=10 $PROJECT_DIR/test_mini.py $PROJECT_DIR/test_basic.py + - pytest -vl --duration=10 $PROJECT_DIR/test_mini.py - TEST_RETURN_CODE=$? - if [[ "$TEST_RETURN_CODE" != "0" ]]; then exit $TEST_RETURN_CODE From 9c56777c133c5a5159d4c11b38082d5fa6f2d838 Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Wed, 13 Mar 2019 09:57:52 -0700 Subject: [PATCH 72/89] Syntax errors --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2b6db071a..66127bbd2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -71,8 +71,8 @@ matrix: - pytest -vl --duration=10 $PROJECT_DIR/test_mini.py - TEST_RETURN_CODE=$? - if [[ "$TEST_RETURN_CODE" != "0" ]]; then - exit $TEST_RETURN_CODE - fi + exit $TEST_RETURN_CODE; + fi; - popd before_install: From 8659726bbb70b7613e5fa914ea4d41daff9620e0 Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Wed, 13 Mar 2019 09:58:37 -0700 Subject: [PATCH 73/89] Try removing extraneous installs for ray [ci ray] --- .travis.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 66127bbd2..aa9c71866 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,10 +54,6 @@ matrix: install: - pip install . - pip install --upgrade -r dev-requirements.txt - - pip install tornado - - if [[ $TRAVIS_PYTHON_VERSION != 'pypy'* ]]; then - pip install numpy scipy; - fi - pip install $TEST_REQUIREMENTS; - pip install ray==0.6.4; - PROJECT_DIR="$(python -c "import os,ray,sys;print(os.path.dirname(ray.__file__));sys.stdout.flush()")"; From 1155cde8228f71301d1e0a159ecce415d968213e Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Wed, 13 Mar 2019 10:04:13 -0700 Subject: [PATCH 74/89] Syntax error [ci ray] --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index aa9c71866..15c3cb02a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -66,10 +66,10 @@ matrix: - pushd $PROJECT_DIR - pytest -vl --duration=10 $PROJECT_DIR/test_mini.py - TEST_RETURN_CODE=$? - - if [[ "$TEST_RETURN_CODE" != "0" ]]; then - exit $TEST_RETURN_CODE; - fi; - popd + - if [[ "$TEST_RETURN_CODE" != "0" ]]; then + exit $TEST_RETURN_CODE + fi before_install: - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then From f85a8fad321399672b7c09ea1d5681233a3f6b51 Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Fri, 15 Mar 2019 19:41:32 -0700 Subject: [PATCH 75/89] Resolve comments [ci ray] --- .travis.yml | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 15c3cb02a..21420e06d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,28 +48,20 @@ matrix: python: 3.7 if: commit_message =~ /(\[ci downstream\]|\[ci joblib\])/ - os: linux - env: PROJECT=ray TEST_REQUIREMENTS="setproctitle psutil" + env: PROJECT=ray python: 3.7 if: commit_message =~ /(\[ci downstream\]|\[ci ray\])/ install: - - pip install . - pip install --upgrade -r dev-requirements.txt - - pip install $TEST_REQUIREMENTS; - - pip install ray==0.6.4; - - PROJECT_DIR="$(python -c "import os,ray,sys;print(os.path.dirname(ray.__file__));sys.stdout.flush()")"; - - rm $PROJECT_DIR/cloudpickle/cloudpickle.py; - - cp cloudpickle/cloudpickle.py $PROJECT_DIR/cloudpickle/cloudpickle.py; - - PROJECT_DIR="$PROJECT_DIR/tests"; + - pip install setproctitle psutil ray==0.6.4 + - PROJECT_DIR="$(python -c "import os,ray,sys;print(os.path.dirname(ray.__file__));sys.stdout.flush()")" + - rm $PROJECT_DIR/cloudpickle/cloudpickle.py + - cp cloudpickle/cloudpickle.py $PROJECT_DIR/cloudpickle/cloudpickle.py + - PROJECT_DIR="$PROJECT_DIR/tests" - pip list script: - COVERAGE_PROCESS_START="$TRAVIS_BUILD_DIR/.coveragerc" PYTHONPATH='.:tests' pytest -r s - - pushd $PROJECT_DIR - pytest -vl --duration=10 $PROJECT_DIR/test_mini.py - - TEST_RETURN_CODE=$? - - popd - - if [[ "$TEST_RETURN_CODE" != "0" ]]; then - exit $TEST_RETURN_CODE - fi before_install: - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then From f27655c6bc5b6b8a9043ca2c557f6d2b7dc9241f Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Fri, 15 Mar 2019 19:44:56 -0700 Subject: [PATCH 76/89] Test to make sure that a bug in cloudpickle will happen in ray [ci ray] --- cloudpickle/cloudpickle.py | 1 + 1 file changed, 1 insertion(+) diff --git a/cloudpickle/cloudpickle.py b/cloudpickle/cloudpickle.py index 75c29977e..1f7af7c95 100644 --- a/cloudpickle/cloudpickle.py +++ b/cloudpickle/cloudpickle.py @@ -260,6 +260,7 @@ def __init__(self, file, protocol=None): Pickler.__init__(self, file, protocol=protocol) # map ids to dictionary. used to ensure that functions can share global env self.globals_ref = {} + raise ValueError("Test Bug") def dump(self, obj): self.inject_addons() From fb8292adca558bbee616d7d2d2811144590eb44c Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Fri, 15 Mar 2019 19:47:16 -0700 Subject: [PATCH 77/89] Temporarily skip cloudpickle tests [ci ray] --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 21420e06d..a20e9252f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -60,7 +60,7 @@ matrix: - PROJECT_DIR="$PROJECT_DIR/tests" - pip list script: - - COVERAGE_PROCESS_START="$TRAVIS_BUILD_DIR/.coveragerc" PYTHONPATH='.:tests' pytest -r s + # - COVERAGE_PROCESS_START="$TRAVIS_BUILD_DIR/.coveragerc" PYTHONPATH='.:tests' pytest -r s - pytest -vl --duration=10 $PROJECT_DIR/test_mini.py before_install: From f5cc58c96146abb725ed093028d1c05f52b67d4c Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Fri, 15 Mar 2019 19:52:17 -0700 Subject: [PATCH 78/89] Remove "bug" from cloudpickle --- .travis.yml | 2 +- cloudpickle/cloudpickle.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a20e9252f..21420e06d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -60,7 +60,7 @@ matrix: - PROJECT_DIR="$PROJECT_DIR/tests" - pip list script: - # - COVERAGE_PROCESS_START="$TRAVIS_BUILD_DIR/.coveragerc" PYTHONPATH='.:tests' pytest -r s + - COVERAGE_PROCESS_START="$TRAVIS_BUILD_DIR/.coveragerc" PYTHONPATH='.:tests' pytest -r s - pytest -vl --duration=10 $PROJECT_DIR/test_mini.py before_install: diff --git a/cloudpickle/cloudpickle.py b/cloudpickle/cloudpickle.py index 1f7af7c95..75c29977e 100644 --- a/cloudpickle/cloudpickle.py +++ b/cloudpickle/cloudpickle.py @@ -260,7 +260,6 @@ def __init__(self, file, protocol=None): Pickler.__init__(self, file, protocol=protocol) # map ids to dictionary. used to ensure that functions can share global env self.globals_ref = {} - raise ValueError("Test Bug") def dump(self, obj): self.inject_addons() From 04d1041b85d83ed210bc5c6bd87d83681c084f28 Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Sun, 17 Mar 2019 16:36:48 -0700 Subject: [PATCH 79/89] resolve comments [ci ray] --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 21420e06d..4b3ef15c1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,11 +57,10 @@ matrix: - PROJECT_DIR="$(python -c "import os,ray,sys;print(os.path.dirname(ray.__file__));sys.stdout.flush()")" - rm $PROJECT_DIR/cloudpickle/cloudpickle.py - cp cloudpickle/cloudpickle.py $PROJECT_DIR/cloudpickle/cloudpickle.py - - PROJECT_DIR="$PROJECT_DIR/tests" - pip list script: - COVERAGE_PROCESS_START="$TRAVIS_BUILD_DIR/.coveragerc" PYTHONPATH='.:tests' pytest -r s - - pytest -vl --duration=10 $PROJECT_DIR/test_mini.py + - pytest -vl --duration=10 $PROJECT_DIR/tests/test_mini.py before_install: - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then From 4e1782b2865ebdfa9f247a7dbb937926cd9d46ab Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Sun, 17 Mar 2019 16:38:22 -0700 Subject: [PATCH 80/89] same as above [ci ray] --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4b3ef15c1..958d68e5d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -52,7 +52,6 @@ matrix: python: 3.7 if: commit_message =~ /(\[ci downstream\]|\[ci ray\])/ install: - - pip install --upgrade -r dev-requirements.txt - pip install setproctitle psutil ray==0.6.4 - PROJECT_DIR="$(python -c "import os,ray,sys;print(os.path.dirname(ray.__file__));sys.stdout.flush()")" - rm $PROJECT_DIR/cloudpickle/cloudpickle.py From bdb9ebeb1a93567b644106f975fba21348a924e4 Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Sun, 17 Mar 2019 18:27:15 -0700 Subject: [PATCH 81/89] Undo change [ci ray] --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 958d68e5d..4b3ef15c1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -52,6 +52,7 @@ matrix: python: 3.7 if: commit_message =~ /(\[ci downstream\]|\[ci ray\])/ install: + - pip install --upgrade -r dev-requirements.txt - pip install setproctitle psutil ray==0.6.4 - PROJECT_DIR="$(python -c "import os,ray,sys;print(os.path.dirname(ray.__file__));sys.stdout.flush()")" - rm $PROJECT_DIR/cloudpickle/cloudpickle.py From 5b0f31930c01d910dce6d737d8bebe54b4f62f29 Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Mon, 18 Mar 2019 09:23:36 -0700 Subject: [PATCH 82/89] Resolve comments [ci ray] --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4b3ef15c1..bca40f0be 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,10 +54,9 @@ matrix: install: - pip install --upgrade -r dev-requirements.txt - pip install setproctitle psutil ray==0.6.4 - - PROJECT_DIR="$(python -c "import os,ray,sys;print(os.path.dirname(ray.__file__));sys.stdout.flush()")" + - PROJECT_DIR="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 - - pip list script: - COVERAGE_PROCESS_START="$TRAVIS_BUILD_DIR/.coveragerc" PYTHONPATH='.:tests' pytest -r s - pytest -vl --duration=10 $PROJECT_DIR/tests/test_mini.py From f92a79ba0f9b7f934858c66b572905dbc90d129c Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Mon, 18 Mar 2019 09:38:03 -0700 Subject: [PATCH 83/89] typo [ci ray] --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bca40f0be..b23638454 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,7 +54,7 @@ matrix: install: - pip install --upgrade -r dev-requirements.txt - pip install setproctitle psutil ray==0.6.4 - - PROJECT_DIR="PROJECT_DIR="$(python -c "import os,ray; print(os.path.dirname(ray.__file__), flush=True)" + - 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 script: From dbd652bc6f7d48af644c0b9c93e04f403eb25b73 Mon Sep 17 00:00:00 2001 From: William Ma <12377941+williamma12@users.noreply.github.com> Date: Mon, 18 Mar 2019 11:23:52 -0700 Subject: [PATCH 84/89] I finally learned how to copy paste code correctly [ci ray] --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b23638454..6c74f0cce 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,7 +54,7 @@ matrix: install: - pip install --upgrade -r dev-requirements.txt - pip install setproctitle psutil ray==0.6.4 - - PROJECT_DIR="$(python -c "import os,ray; print(os.path.dirname(ray.__file__), flush=True)" + - 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 script: From dc544ac94cd2640e92273a870117d7ab2beac14e Mon Sep 17 00:00:00 2001 From: Robert Nishihara Date: Mon, 18 Mar 2019 14:39:59 -0700 Subject: [PATCH 85/89] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6c74f0cce..c89e5c771 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,7 +59,7 @@ matrix: - cp cloudpickle/cloudpickle.py $PROJECT_DIR/cloudpickle/cloudpickle.py script: - COVERAGE_PROCESS_START="$TRAVIS_BUILD_DIR/.coveragerc" PYTHONPATH='.:tests' pytest -r s - - pytest -vl --duration=10 $PROJECT_DIR/tests/test_mini.py + - pytest -vl --duration=10 $PROJECT_DIR/tests/test_basic.py before_install: - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then From 6732c1ca41dc6636ab391cff2275c49662f7d5c9 Mon Sep 17 00:00:00 2001 From: Robert Nishihara Date: Mon, 18 Mar 2019 14:43:53 -0700 Subject: [PATCH 86/89] Update [ci ray] --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c89e5c771..ed98eaf2b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,7 +54,7 @@ matrix: install: - pip install --upgrade -r dev-requirements.txt - pip install setproctitle psutil ray==0.6.4 - - PROJECT_DIR="$(python -c "import os,ray; print(os.path.dirname(ray.__file__), flush=True)")" + - 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 script: From 02ae0076bd4e4e71da18751194b6cb2d4183619f Mon Sep 17 00:00:00 2001 From: Robert Nishihara Date: Mon, 18 Mar 2019 15:03:46 -0700 Subject: [PATCH 87/89] Update [ci ray] --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ed98eaf2b..e303f5d1d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,7 +53,7 @@ matrix: if: commit_message =~ /(\[ci downstream\]|\[ci ray\])/ install: - pip install --upgrade -r dev-requirements.txt - - pip install setproctitle psutil ray==0.6.4 + - pip install setproctitle psutil py-spy ray==0.6.4 - 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 From 8ec294f76b7e755f0e0a2ad91735d35ea5d857e1 Mon Sep 17 00:00:00 2001 From: Robert Nishihara Date: Mon, 18 Mar 2019 15:30:10 -0700 Subject: [PATCH 88/89] update [ci ray] --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index e303f5d1d..98d942d8e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -60,6 +60,7 @@ matrix: script: - COVERAGE_PROCESS_START="$TRAVIS_BUILD_DIR/.coveragerc" PYTHONPATH='.:tests' pytest -r s - pytest -vl --duration=10 $PROJECT_DIR/tests/test_basic.py + - pytest -vl --duration=10 $PROJECT_DIR/tests/test_recursion.py before_install: - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then From 5edfb20605ec24264a419aa98fadb71808623da3 Mon Sep 17 00:00:00 2001 From: Robert Nishihara Date: Mon, 18 Mar 2019 15:47:47 -0700 Subject: [PATCH 89/89] Update [ci ray] --- .travis.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 98d942d8e..f9910afa3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,14 +53,17 @@ matrix: if: commit_message =~ /(\[ci downstream\]|\[ci ray\])/ install: - pip install --upgrade -r dev-requirements.txt - - pip install setproctitle psutil py-spy ray==0.6.4 + - pip install setproctitle psutil ray==0.6.4 - 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 script: - COVERAGE_PROCESS_START="$TRAVIS_BUILD_DIR/.coveragerc" PYTHONPATH='.:tests' pytest -r s - - pytest -vl --duration=10 $PROJECT_DIR/tests/test_basic.py - - pytest -vl --duration=10 $PROJECT_DIR/tests/test_recursion.py + - pytest -vl $PROJECT_DIR/tests/test_basic.py::test_simple_serialization + - pytest -vl $PROJECT_DIR/tests/test_basic.py::test_complex_serialization + - pytest -vl $PROJECT_DIR/tests/test_basic.py::test_ray_recursive_objects + - pytest -vl $PROJECT_DIR/tests/test_basic.py::test_serialization_final_fallback + - pytest -vl $PROJECT_DIR/tests/test_recursion.py before_install: - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then