From 12b337a9cd8fda12865c2a1d968a0ee3bb18750f Mon Sep 17 00:00:00 2001 From: Pierre Glaser Date: Thu, 24 Jan 2019 17:27:20 +0100 Subject: [PATCH 01/42] MNT add cron builds for loky, joblib, distributed --- .travis.yml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/.travis.yml b/.travis.yml index 74a5762e4..8bebad54f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,6 +20,24 @@ matrix: python: 3.5 - os: linux python: 2.7 + - os: linux + if: type = cron + # The pytest major version is constrained to 3 because running the + # distributed test suite with pytest 4 fails for now + env: PROJECT=distributed + TEST_REQUIREMENTS="pytest==3.6 numpy pandas mock" + PROJECT_URL=https://github.com/dask/distributed.git + python: 3.7 + - os: linux + if: type = cron + env: PROJECT=loky TEST_REQUIREMENTS="pytest psutil" + PROJECT_URL=https://github.com/tomMoral/loky.git + python: 3.7 + - os: linux + if: type = cron + env: PROJECT=joblib TEST_REQUIREMENTS="pytest numpy distributed" + PROJECT_URL=https://github.com/joblib/joblib.git + python: 3.7 before_install: - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then @@ -34,6 +52,18 @@ install: - if [[ $TRAVIS_PYTHON_VERSION != 'pypy'* ]]; then pip install numpy scipy; fi + - if [[ $TRAVIS_EVENT_TYPE == "cron" ]]; 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 + pip install ./$PROJECT + popd + fi - pip list before_script: # stop the build if there are Python syntax errors or undefined names @@ -43,6 +73,11 @@ before_script: - python ci/install_coverage_subprocess_pth.py script: - COVERAGE_PROCESS_START="$TRAVIS_BUILD_DIR/.coveragerc" PYTHONPATH='.:tests' pytest -r s + - if [[ $TRAVIS_EVENT_TYPE == "cron" ]]; then + pushd ../$PROJECT + python -mpytest -vl + popd + fi after_success: - coverage combine --append - codecov From 8e9bb452ddf994595e7dbc78c80c041db003ce33 Mon Sep 17 00:00:00 2001 From: Pierre Glaser Date: Fri, 25 Jan 2019 14:20:54 +0100 Subject: [PATCH 02/42] FIX add semicolons --- .travis.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8bebad54f..8b3f96e37 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,16 +53,16 @@ install: pip install numpy scipy; fi - if [[ $TRAVIS_EVENT_TYPE == "cron" ]]; then - pip install $TEST_REQUIREMENTS - pushd .. - git clone $PROJECT_URL + pip install $TEST_REQUIREMENTS; + pushd ..; + git clone $PROJECT_URL; if [[ $PROJECT == "joblib" ]]; then - pushd joblib/joblib/externals - source vendor_cloudpickle.sh ../../../cloudpickle - popd + pushd joblib/joblib/externals; + source vendor_cloudpickle.sh ../../../cloudpickle; + popd; fi - pip install ./$PROJECT - popd + pip install ./$PROJECT; + popd; fi - pip list before_script: @@ -74,9 +74,9 @@ before_script: script: - COVERAGE_PROCESS_START="$TRAVIS_BUILD_DIR/.coveragerc" PYTHONPATH='.:tests' pytest -r s - if [[ $TRAVIS_EVENT_TYPE == "cron" ]]; then - pushd ../$PROJECT - python -mpytest -vl - popd + pushd ../$PROJECT; + python -mpytest -vl; + popd; fi after_success: - coverage combine --append From 43ad1d606c24e615601dd4f4baff32c053b75f90 Mon Sep 17 00:00:00 2001 From: Pierre Glaser Date: Fri, 25 Jan 2019 14:24:25 +0100 Subject: [PATCH 03/42] last semicolon --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8b3f96e37..9d236e9df 100644 --- a/.travis.yml +++ b/.travis.yml @@ -60,7 +60,7 @@ install: pushd joblib/joblib/externals; source vendor_cloudpickle.sh ../../../cloudpickle; popd; - fi + fi; pip install ./$PROJECT; popd; fi From 61e410fd91c080c56cef2bff357cae9759bca7b2 Mon Sep 17 00:00:00 2001 From: Pierre Glaser Date: Fri, 25 Jan 2019 17:57:18 +0100 Subject: [PATCH 04/42] DOC add comment about travis's integration tests --- .travis.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9d236e9df..2edbfa242 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,8 +22,13 @@ matrix: python: 2.7 - os: linux if: type = cron - # The pytest major version is constrained to 3 because running the - # distributed test suite with pytest 4 fails for now + # 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 env: PROJECT=distributed TEST_REQUIREMENTS="pytest==3.6 numpy pandas mock" PROJECT_URL=https://github.com/dask/distributed.git From 9e457ae8cd4c78c9537ebf90166f178363161e5c Mon Sep 17 00:00:00 2001 From: Pierre Glaser Date: Fri, 25 Jan 2019 17:59:04 +0100 Subject: [PATCH 05/42] CLN check on PROJECT rather than TRAVIS_EVENT_TYPE --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2edbfa242..75a00313e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,7 +57,7 @@ install: - if [[ $TRAVIS_PYTHON_VERSION != 'pypy'* ]]; then pip install numpy scipy; fi - - if [[ $TRAVIS_EVENT_TYPE == "cron" ]]; then + - if [[ $PROJECT != "" ]]; then pip install $TEST_REQUIREMENTS; pushd ..; git clone $PROJECT_URL; @@ -78,7 +78,7 @@ before_script: - python ci/install_coverage_subprocess_pth.py script: - COVERAGE_PROCESS_START="$TRAVIS_BUILD_DIR/.coveragerc" PYTHONPATH='.:tests' pytest -r s - - if [[ $TRAVIS_EVENT_TYPE == "cron" ]]; then + - if [[ $PROJECT != "" ]]; then pushd ../$PROJECT; python -mpytest -vl; popd; From bb9e3276c2a9acde575e81376d7575f71fd14c58 Mon Sep 17 00:00:00 2001 From: Pierre Glaser Date: Fri, 25 Jan 2019 17:59:46 +0100 Subject: [PATCH 06/42] TST temporary remove the cron condition --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 75a00313e..e6f56bfae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,6 @@ matrix: - os: linux python: 2.7 - os: linux - if: type = cron # 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 @@ -34,12 +33,10 @@ matrix: PROJECT_URL=https://github.com/dask/distributed.git python: 3.7 - os: linux - if: type = cron env: PROJECT=loky TEST_REQUIREMENTS="pytest psutil" PROJECT_URL=https://github.com/tomMoral/loky.git python: 3.7 - os: linux - if: type = cron env: PROJECT=joblib TEST_REQUIREMENTS="pytest numpy distributed" PROJECT_URL=https://github.com/joblib/joblib.git python: 3.7 From 2be1fcd1811b81ae184d17e56544096727360935 Mon Sep 17 00:00:00 2001 From: Pierre Glaser Date: Mon, 28 Jan 2019 10:10:38 +0100 Subject: [PATCH 07/42] manually catch pytest exit code --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index e6f56bfae..af68359eb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -78,7 +78,11 @@ script: - if [[ $PROJECT != "" ]]; then pushd ../$PROJECT; python -mpytest -vl; + TEST_RETURN_CODE=$?; popd; + if [[ "$TEST_RETURN_CODE" != "0" ]]; then + exit $TEST_RETURN_CODE; + fi; fi after_success: - coverage combine --append From 04dd3843aa320b853fe10127cfa021c69a85335a Mon Sep 17 00:00:00 2001 From: Pierre Glaser Date: Mon, 28 Jan 2019 10:38:58 +0100 Subject: [PATCH 08/42] run distributed tests on a full virtual machine --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index af68359eb..5b14fc035 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,10 @@ matrix: # 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 + # 3 because running it's test suite with pytest 4 fails for now. Also, + # setting sudo to "enabled" to run the tests on a full virtual machine + # instead of a container. See dask/distributed #1563 + sudo: required env: PROJECT=distributed TEST_REQUIREMENTS="pytest==3.6 numpy pandas mock" PROJECT_URL=https://github.com/dask/distributed.git From 392227c769239225f6e177cdbf554f6204d081a2 Mon Sep 17 00:00:00 2001 From: Pierre Glaser Date: Mon, 28 Jan 2019 10:53:09 +0100 Subject: [PATCH 09/42] re-create distributed exact test environment --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 5b14fc035..3ce9a5b6c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,6 +31,7 @@ matrix: # setting sudo to "enabled" to run the tests on a full virtual machine # instead of a container. See dask/distributed #1563 sudo: required + dist: trusty env: PROJECT=distributed TEST_REQUIREMENTS="pytest==3.6 numpy pandas mock" PROJECT_URL=https://github.com/dask/distributed.git From 500de3ec61d674f8ab9f0cbadada94066b223a39 Mon Sep 17 00:00:00 2001 From: Pierre Glaser Date: Mon, 28 Jan 2019 10:58:28 +0100 Subject: [PATCH 10/42] use python 3.6 for distributed --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3ce9a5b6c..e2895e847 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,7 +35,7 @@ matrix: env: PROJECT=distributed TEST_REQUIREMENTS="pytest==3.6 numpy pandas mock" PROJECT_URL=https://github.com/dask/distributed.git - python: 3.7 + python: 3.6 - os: linux env: PROJECT=loky TEST_REQUIREMENTS="pytest psutil" PROJECT_URL=https://github.com/tomMoral/loky.git From 33c4bbeae93a495295840667e9ed6226cf1608c1 Mon Sep 17 00:00:00 2001 From: Pierre Glaser Date: Mon, 28 Jan 2019 11:15:23 +0100 Subject: [PATCH 11/42] add bokeh to distributed dependencies this seems to fix test_duplicate_clients --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e2895e847..27e16dada 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,7 @@ matrix: sudo: required dist: trusty env: PROJECT=distributed - TEST_REQUIREMENTS="pytest==3.6 numpy pandas mock" + TEST_REQUIREMENTS="pytest==3.6 numpy pandas mock bokeh" PROJECT_URL=https://github.com/dask/distributed.git python: 3.6 - os: linux From 57b1d668eccde1ecc6c2000b0e146ec42358fd10 Mon Sep 17 00:00:00 2001 From: Pierre Glaser Date: Mon, 28 Jan 2019 11:39:26 +0100 Subject: [PATCH 12/42] upgrade ubuntu because of openssl version --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 27e16dada..739c0815e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,6 @@ matrix: # setting sudo to "enabled" to run the tests on a full virtual machine # instead of a container. See dask/distributed #1563 sudo: required - dist: trusty env: PROJECT=distributed TEST_REQUIREMENTS="pytest==3.6 numpy pandas mock bokeh" PROJECT_URL=https://github.com/dask/distributed.git From 1a1def69ba15277ae9c13a0fe14d3a2a755c5ada Mon Sep 17 00:00:00 2001 From: Pierre Glaser Date: Mon, 28 Jan 2019 12:00:47 +0100 Subject: [PATCH 13/42] debug using my local fork --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 739c0815e..ba26cdc9f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,7 @@ matrix: sudo: required env: PROJECT=distributed TEST_REQUIREMENTS="pytest==3.6 numpy pandas mock bokeh" - PROJECT_URL=https://github.com/dask/distributed.git + PROJECT_URL=https://github.com/pierreglaser/distributed.git python: 3.6 - os: linux env: PROJECT=loky TEST_REQUIREMENTS="pytest psutil" @@ -60,7 +60,7 @@ install: - if [[ $PROJECT != "" ]]; then pip install $TEST_REQUIREMENTS; pushd ..; - git clone $PROJECT_URL; + git clone --branch fix-test-listen-args $PROJECT_URL; if [[ $PROJECT == "joblib" ]]; then pushd joblib/joblib/externals; source vendor_cloudpickle.sh ../../../cloudpickle; From 84236a3c79fdeb5087380503cacb670de0b5808f Mon Sep 17 00:00:00 2001 From: Pierre Glaser Date: Mon, 28 Jan 2019 13:07:35 +0100 Subject: [PATCH 14/42] remove python3.6 dependency, upgrade to xenial --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ba26cdc9f..4f6b5c1b2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,7 @@ matrix: env: PROJECT=distributed TEST_REQUIREMENTS="pytest==3.6 numpy pandas mock bokeh" PROJECT_URL=https://github.com/pierreglaser/distributed.git - python: 3.6 + dist: xenial - os: linux env: PROJECT=loky TEST_REQUIREMENTS="pytest psutil" PROJECT_URL=https://github.com/tomMoral/loky.git From 98640fbf6355b34c4b773db5f016319d763c776d Mon Sep 17 00:00:00 2001 From: Pierre Glaser Date: Mon, 28 Jan 2019 13:10:18 +0100 Subject: [PATCH 15/42] test only the failing tests --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4f6b5c1b2..b662e4204 100644 --- a/.travis.yml +++ b/.travis.yml @@ -80,7 +80,7 @@ script: - COVERAGE_PROCESS_START="$TRAVIS_BUILD_DIR/.coveragerc" PYTHONPATH='.:tests' pytest -r s - if [[ $PROJECT != "" ]]; then pushd ../$PROJECT; - python -mpytest -vl; + python -mpytest -vlk 'test_listen_args'; TEST_RETURN_CODE=$?; popd; if [[ "$TEST_RETURN_CODE" != "0" ]]; then From 4efe205d9ae7f00d575bce1869bfc250af3b77db Mon Sep 17 00:00:00 2001 From: Pierre Glaser Date: Mon, 28 Jan 2019 14:58:56 +0100 Subject: [PATCH 16/42] python 3.7 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index b662e4204..a28b9d472 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,6 +30,7 @@ matrix: # 3 because running it's test suite with pytest 4 fails for now. Also, # setting sudo to "enabled" to run the tests on a full virtual machine # instead of a container. See dask/distributed #1563 + python: 3.7 sudo: required env: PROJECT=distributed TEST_REQUIREMENTS="pytest==3.6 numpy pandas mock bokeh" From bcdd785289b59c734eebb24b1337f2328025a3d4 Mon Sep 17 00:00:00 2001 From: Pierre Glaser Date: Mon, 28 Jan 2019 15:57:50 +0100 Subject: [PATCH 17/42] skip the two failing tests --- .travis.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index a28b9d472..8cc0daf7d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,13 +28,14 @@ matrix: # 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, - # setting sudo to "enabled" to run the tests on a full virtual machine - # instead of a container. See dask/distributed #1563 + # 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/pierreglaser/distributed.git + PROJECT_URL=https://github.com/dask/distributed.git + PYTEST_ARGS=-k 'not test_connection_args and not test_listen_args' dist: xenial - os: linux env: PROJECT=loky TEST_REQUIREMENTS="pytest psutil" @@ -61,7 +62,7 @@ install: - if [[ $PROJECT != "" ]]; then pip install $TEST_REQUIREMENTS; pushd ..; - git clone --branch fix-test-listen-args $PROJECT_URL; + git clone $PROJECT_URL; if [[ $PROJECT == "joblib" ]]; then pushd joblib/joblib/externals; source vendor_cloudpickle.sh ../../../cloudpickle; From 8f2325386405628d466ce8050acfd712e0824add Mon Sep 17 00:00:00 2001 From: Pierre Glaser Date: Mon, 28 Jan 2019 16:14:19 +0100 Subject: [PATCH 18/42] use pytest_args --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8cc0daf7d..4c7e5a00d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -82,7 +82,7 @@ script: - COVERAGE_PROCESS_START="$TRAVIS_BUILD_DIR/.coveragerc" PYTHONPATH='.:tests' pytest -r s - if [[ $PROJECT != "" ]]; then pushd ../$PROJECT; - python -mpytest -vlk 'test_listen_args'; + python -mpytest -vl $PYTEST_ARGS; TEST_RETURN_CODE=$?; popd; if [[ "$TEST_RETURN_CODE" != "0" ]]; then From eeb82f026ad85a5e22bbb0bdc18f556721090c59 Mon Sep 17 00:00:00 2001 From: Pierre Glaser Date: Mon, 28 Jan 2019 16:40:32 +0100 Subject: [PATCH 19/42] escape quotes properly --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4c7e5a00d..865e404c8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,7 +35,7 @@ matrix: 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' + PYTEST_ARGS="-k ''not test_connection_args and not test_listen_args''" dist: xenial - os: linux env: PROJECT=loky TEST_REQUIREMENTS="pytest psutil" From a783d647351b3a7f89c4ae58006ebbc17b0ae20b Mon Sep 17 00:00:00 2001 From: Pierre Glaser Date: Mon, 28 Jan 2019 16:51:56 +0100 Subject: [PATCH 20/42] another quote try --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 865e404c8..a16b1f984 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,7 +35,7 @@ matrix: 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''" + PYTEST_ARGS='-k ''not test_connection_args and not test_listen_args''' dist: xenial - os: linux env: PROJECT=loky TEST_REQUIREMENTS="pytest psutil" From fb687031d7390842c1f36ef6f58d0a913a055240 Mon Sep 17 00:00:00 2001 From: Pierre Glaser Date: Mon, 28 Jan 2019 17:06:21 +0100 Subject: [PATCH 21/42] yet another try --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a16b1f984..9362f7cd4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,7 +35,7 @@ matrix: 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''' + PYTEST_ARGS='-k "not test_connection_args and not test_listen_args"' dist: xenial - os: linux env: PROJECT=loky TEST_REQUIREMENTS="pytest psutil" From 718f594f3dd3f6308c501df688bd58ccf04afba1 Mon Sep 17 00:00:00 2001 From: Pierre Glaser Date: Mon, 28 Jan 2019 17:20:04 +0100 Subject: [PATCH 22/42] debug --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9362f7cd4..15420d221 100644 --- a/.travis.yml +++ b/.travis.yml @@ -82,7 +82,8 @@ script: - COVERAGE_PROCESS_START="$TRAVIS_BUILD_DIR/.coveragerc" PYTHONPATH='.:tests' pytest -r s - if [[ $PROJECT != "" ]]; then pushd ../$PROJECT; - python -mpytest -vl $PYTEST_ARGS; + CMD="python -mpytest -vl $PYTEST_ARGS"; + echo $CMD TEST_RETURN_CODE=$?; popd; if [[ "$TEST_RETURN_CODE" != "0" ]]; then From e9b364404f9bf461df39a2b169782a377964fd10 Mon Sep 17 00:00:00 2001 From: Pierre Glaser Date: Mon, 28 Jan 2019 17:28:58 +0100 Subject: [PATCH 23/42] WIP --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 15420d221..a6de14f97 100644 --- a/.travis.yml +++ b/.travis.yml @@ -83,7 +83,6 @@ script: - if [[ $PROJECT != "" ]]; then pushd ../$PROJECT; CMD="python -mpytest -vl $PYTEST_ARGS"; - echo $CMD TEST_RETURN_CODE=$?; popd; if [[ "$TEST_RETURN_CODE" != "0" ]]; then From 84ec4cfe6b3458c75a97608d3183b097c17a3870 Mon Sep 17 00:00:00 2001 From: Pierre Glaser Date: Mon, 28 Jan 2019 17:34:44 +0100 Subject: [PATCH 24/42] WIP --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a6de14f97..9362f7cd4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -82,7 +82,7 @@ script: - COVERAGE_PROCESS_START="$TRAVIS_BUILD_DIR/.coveragerc" PYTHONPATH='.:tests' pytest -r s - if [[ $PROJECT != "" ]]; then pushd ../$PROJECT; - CMD="python -mpytest -vl $PYTEST_ARGS"; + python -mpytest -vl $PYTEST_ARGS; TEST_RETURN_CODE=$?; popd; if [[ "$TEST_RETURN_CODE" != "0" ]]; then From caf5aa60c9d7661fd4fc409870da31734894d0d3 Mon Sep 17 00:00:00 2001 From: Pierre Glaser Date: Mon, 28 Jan 2019 17:42:59 +0100 Subject: [PATCH 25/42] WIP --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9362f7cd4..a9bad1714 100644 --- a/.travis.yml +++ b/.travis.yml @@ -81,8 +81,10 @@ before_script: script: - COVERAGE_PROCESS_START="$TRAVIS_BUILD_DIR/.coveragerc" PYTHONPATH='.:tests' pytest -r s - if [[ $PROJECT != "" ]]; then + TEST_CMD="python -mpytest -vl $PYTEST_ARGS"; pushd ../$PROJECT; - python -mpytest -vl $PYTEST_ARGS; + echo $TEST_CMD; + $TEST_CMD; TEST_RETURN_CODE=$?; popd; if [[ "$TEST_RETURN_CODE" != "0" ]]; then From aa7d3f06162421b7c114e84c4e7a6bf5781cf3cb Mon Sep 17 00:00:00 2001 From: Pierre Glaser Date: Mon, 28 Jan 2019 17:54:31 +0100 Subject: [PATCH 26/42] WIP --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index a9bad1714..e931c8b0d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -81,10 +81,8 @@ before_script: script: - COVERAGE_PROCESS_START="$TRAVIS_BUILD_DIR/.coveragerc" PYTHONPATH='.:tests' pytest -r s - if [[ $PROJECT != "" ]]; then - TEST_CMD="python -mpytest -vl $PYTEST_ARGS"; pushd ../$PROJECT; - echo $TEST_CMD; - $TEST_CMD; + python -mpytest -vl -k 'not test_connection_args and not test_listen_args'; TEST_RETURN_CODE=$?; popd; if [[ "$TEST_RETURN_CODE" != "0" ]]; then From cdd9c2fbac2e2020458ee0a2b4762a5a10a3e211 Mon Sep 17 00:00:00 2001 From: Pierre Glaser Date: Mon, 28 Jan 2019 18:03:44 +0100 Subject: [PATCH 27/42] WIP --- .travis.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e931c8b0d..b8dc5864d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,7 +35,7 @@ matrix: 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"' + PYTEST_FILTER="'not test_connection_args and not test_listen_args'" dist: xenial - os: linux env: PROJECT=loky TEST_REQUIREMENTS="pytest psutil" @@ -81,8 +81,12 @@ before_script: script: - COVERAGE_PROCESS_START="$TRAVIS_BUILD_DIR/.coveragerc" PYTHONPATH='.:tests' pytest -r s - if [[ $PROJECT != "" ]]; then + TEST_CMD="python -mpytest -vl" + if [[ "$PYTEST_FILTER" != "" ]]; then + TEST_CMD="$TEST_CMD -k $PYTEST_FILTER"; + fi; + $TEST_CMD pushd ../$PROJECT; - python -mpytest -vl -k 'not test_connection_args and not test_listen_args'; TEST_RETURN_CODE=$?; popd; if [[ "$TEST_RETURN_CODE" != "0" ]]; then From 298d237b5425b0715a5601fdd80bd6be6090a38a Mon Sep 17 00:00:00 2001 From: Pierre Glaser Date: Mon, 28 Jan 2019 18:09:43 +0100 Subject: [PATCH 28/42] WIP --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b8dc5864d..4835c27fd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -85,7 +85,7 @@ script: if [[ "$PYTEST_FILTER" != "" ]]; then TEST_CMD="$TEST_CMD -k $PYTEST_FILTER"; fi; - $TEST_CMD + $TEST_CMD; pushd ../$PROJECT; TEST_RETURN_CODE=$?; popd; From 96eb36b95371d51709a40472021322b532c26067 Mon Sep 17 00:00:00 2001 From: Pierre Glaser Date: Mon, 28 Jan 2019 18:10:54 +0100 Subject: [PATCH 29/42] WIP --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4835c27fd..1015048ab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -85,8 +85,8 @@ script: if [[ "$PYTEST_FILTER" != "" ]]; then TEST_CMD="$TEST_CMD -k $PYTEST_FILTER"; fi; - $TEST_CMD; pushd ../$PROJECT; + $TEST_CMD; TEST_RETURN_CODE=$?; popd; if [[ "$TEST_RETURN_CODE" != "0" ]]; then From acce4e6bb0dcd59147c51d91cb28b910025b5e63 Mon Sep 17 00:00:00 2001 From: Pierre Glaser Date: Mon, 28 Jan 2019 18:38:11 +0100 Subject: [PATCH 30/42] WIP --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1015048ab..c42af71b1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -81,7 +81,7 @@ before_script: script: - COVERAGE_PROCESS_START="$TRAVIS_BUILD_DIR/.coveragerc" PYTHONPATH='.:tests' pytest -r s - if [[ $PROJECT != "" ]]; then - TEST_CMD="python -mpytest -vl" + TEST_CMD="python -mpytest -vl"; if [[ "$PYTEST_FILTER" != "" ]]; then TEST_CMD="$TEST_CMD -k $PYTEST_FILTER"; fi; From 71d041df898514f9940b15a242b42a218dad348e Mon Sep 17 00:00:00 2001 From: Pierre Glaser Date: Mon, 28 Jan 2019 19:03:04 +0100 Subject: [PATCH 31/42] WIP --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c42af71b1..e6be8c22d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -81,11 +81,12 @@ before_script: script: - COVERAGE_PROCESS_START="$TRAVIS_BUILD_DIR/.coveragerc" PYTHONPATH='.:tests' pytest -r s - if [[ $PROJECT != "" ]]; then - TEST_CMD="python -mpytest -vl"; + PYTEST_ARGS="-vl" if [[ "$PYTEST_FILTER" != "" ]]; then - TEST_CMD="$TEST_CMD -k $PYTEST_FILTER"; + PYTEST_ARGS=($PYTEST_ARGS -k $PYTEST_FILTER); fi; pushd ../$PROJECT; + pytest "${PYTEST_ARGS[@]}"; $TEST_CMD; TEST_RETURN_CODE=$?; popd; From 002a0b3bdbd1e0ba0181e1619ac2808cfa084eae Mon Sep 17 00:00:00 2001 From: Pierre Glaser Date: Mon, 28 Jan 2019 10:53:09 +0100 Subject: [PATCH 32/42] filter out openssl tests --- .travis.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5b14fc035..981e2256f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,13 +28,15 @@ matrix: # 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, - # setting sudo to "enabled" to run the tests on a full virtual machine - # instead of a container. See dask/distributed #1563 + # 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" + TEST_REQUIREMENTS="pytest==3.6 numpy pandas mock bokeh" PROJECT_URL=https://github.com/dask/distributed.git - python: 3.7 + PYTEST_ARGS="-k not test_connection_args and not test_listen_args" + dist: xenial - os: linux env: PROJECT=loky TEST_REQUIREMENTS="pytest psutil" PROJECT_URL=https://github.com/tomMoral/loky.git @@ -80,7 +82,7 @@ script: - COVERAGE_PROCESS_START="$TRAVIS_BUILD_DIR/.coveragerc" PYTHONPATH='.:tests' pytest -r s - if [[ $PROJECT != "" ]]; then pushd ../$PROJECT; - python -mpytest -vl; + pytest -vl "$PYTEST_ARGS"; TEST_RETURN_CODE=$?; popd; if [[ "$TEST_RETURN_CODE" != "0" ]]; then From 1f5ebe4a03a35e841163586cec888caef39dbfcd Mon Sep 17 00:00:00 2001 From: Pierre Glaser Date: Mon, 28 Jan 2019 23:52:14 +0100 Subject: [PATCH 33/42] ci trigger --- .travis.yml | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 981e2256f..7fec52d4d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,7 +36,6 @@ matrix: 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" - dist: xenial - os: linux env: PROJECT=loky TEST_REQUIREMENTS="pytest psutil" PROJECT_URL=https://github.com/tomMoral/loky.git @@ -80,14 +79,21 @@ before_script: - python ci/install_coverage_subprocess_pth.py script: - COVERAGE_PROCESS_START="$TRAVIS_BUILD_DIR/.coveragerc" PYTHONPATH='.:tests' pytest -r s - - if [[ $PROJECT != "" ]]; then - pushd ../$PROJECT; - pytest -vl "$PYTEST_ARGS"; - TEST_RETURN_CODE=$?; - popd; - if [[ "$TEST_RETURN_CODE" != "0" ]]; then - exit $TEST_RETURN_CODE; - fi; + - | + 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. + if [[ "$PYTEST_ARGS" != "" ]]; then + pytest -vl "$PYTEST_ARGS" + else + pytest -vl + fi + TEST_RETURN_CODE=$? + popd + if [[ "$TEST_RETURN_CODE" != "0" ]]; then + exit $TEST_RETURN_CODE + fi fi after_success: - coverage combine --append From a6551a3513826826b761693e9668d8bfa7419007 Mon Sep 17 00:00:00 2001 From: Pierre Glaser Date: Tue, 29 Jan 2019 09:57:50 +0100 Subject: [PATCH 34/42] make sure exit codes are retrieved properly --- .travis.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index c52d75c75..6ef9d521f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -84,11 +84,7 @@ script: 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 - pytest -vl "$PYTEST_ARGS" - else - pytest -vl - fi + pytest -vl popd fi after_success: From 0564dd1092aff4f1a9654ab14560c8f893474938 Mon Sep 17 00:00:00 2001 From: Pierre Glaser Date: Tue, 29 Jan 2019 10:28:05 +0100 Subject: [PATCH 35/42] go back to manually catch exit code --- .travis.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6ef9d521f..7fec52d4d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -84,8 +84,16 @@ script: 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. - pytest -vl + if [[ "$PYTEST_ARGS" != "" ]]; then + pytest -vl "$PYTEST_ARGS" + else + pytest -vl + fi + TEST_RETURN_CODE=$? popd + if [[ "$TEST_RETURN_CODE" != "0" ]]; then + exit $TEST_RETURN_CODE + fi fi after_success: - coverage combine --append From a3c86bb11aeb20f606a66c7862220ad902b69d06 Mon Sep 17 00:00:00 2001 From: Pierre Glaser Date: Tue, 29 Jan 2019 10:34:35 +0100 Subject: [PATCH 36/42] ci-downstream use flags in commit_messages instead of cron jobs --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 7fec52d4d..01ba1993a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,14 +36,17 @@ matrix: 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)/ before_install: - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then From cacd7a0b253841c8adf63bb92edb02f3aa087a2a Mon Sep 17 00:00:00 2001 From: Pierre Glaser Date: Tue, 29 Jan 2019 14:33:17 +0100 Subject: [PATCH 37/42] [ci skip] use travis conventions to trigger ci --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 01ba1993a..451f4c59c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,17 +36,17 @@ matrix: 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)/ + 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)/ + 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)/ + if: commit_message =~ /(\[ci downstream\]|\[ci joblib\])/ before_install: - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then From 95c742939922a14442ddbde6abcaa35d97acdf05 Mon Sep 17 00:00:00 2001 From: Pierre Glaser Date: Tue, 29 Jan 2019 14:38:17 +0100 Subject: [PATCH 38/42] [ci loky] trigger loky's ci --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 451f4c59c..bdd338040 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,7 @@ matrix: # 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. + # skipped python: 3.7 sudo: required env: PROJECT=distributed From f86a03c877b2692d73b6bd51eb35c62b567f181b Mon Sep 17 00:00:00 2001 From: Pierre Glaser Date: Tue, 29 Jan 2019 14:49:41 +0100 Subject: [PATCH 39/42] ci loky make sure this does not trigger ci --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bdd338040..451f4c59c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,7 @@ matrix: # 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 + # skipped. python: 3.7 sudo: required env: PROJECT=distributed From 1ae09c88f715897a1a472678166a93ec077a008b Mon Sep 17 00:00:00 2001 From: Pierre Glaser Date: Tue, 29 Jan 2019 14:50:43 +0100 Subject: [PATCH 40/42] [ci distributed] trigger distributed test suite --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 451f4c59c..bdd338040 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,7 @@ matrix: # 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. + # skipped python: 3.7 sudo: required env: PROJECT=distributed From 59bba181fe0d4936c83c20b222a38845644c3488 Mon Sep 17 00:00:00 2001 From: Pierre Glaser Date: Tue, 29 Jan 2019 14:51:52 +0100 Subject: [PATCH 41/42] ci distributed make sure ci is not triggered --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bdd338040..451f4c59c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,7 @@ matrix: # 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 + # skipped. python: 3.7 sudo: required env: PROJECT=distributed From 5b468cda20e03b5501b8ab939fbfbbcad7bf4565 Mon Sep 17 00:00:00 2001 From: Pierre Glaser Date: Tue, 29 Jan 2019 14:52:57 +0100 Subject: [PATCH 42/42] [ci downstream] trigger all integration builds --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 451f4c59c..bdd338040 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,7 @@ matrix: # 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. + # skipped python: 3.7 sudo: required env: PROJECT=distributed