From 75ef63fa00e6cf4f55e37d387229e5dc617f4773 Mon Sep 17 00:00:00 2001 From: INADA Naoki Date: Sat, 11 Feb 2017 18:18:27 +0900 Subject: [PATCH 1/4] Add .travis.yml to 2.7 branch --- .travis.yml | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000000000..1066e5fb1450be --- /dev/null +++ b/.travis.yml @@ -0,0 +1,85 @@ +language: c +dist: trusty +sudo: false +group: beta + +# To cache doc-building dependencies. +cache: pip + +os: + - linux + # macOS builds are disabled as the machines are under-provisioned on Travis, + # adding up to an extra hour completing a full CI run. + #- osx + +compiler: + - clang + - gcc + +env: + - TESTING=cpython + +matrix: + allow_failures: + - env: + - TESTING=coverage + include: + - os: linux + language: python + python: 3.5 + env: + - TESTING=docs + before_script: + - cd Doc + - make venv PYTHON=python3 + script: + - make html SPHINXBUILD="./venv/bin/python3 -m sphinx" SPHINXOPTS="-q" + - os: linux + language: c + compiler: clang + env: + - TESTING=coverage + before_script: + - ./configure + - make -s -j4 + # Need a venv that can parse covered code. + - ./python -m venv venv + - ./venv/bin/python -m pip install -U coverage + script: + # Skip tests that re-run the entire test suite. + - ./venv/bin/python -m coverage run --pylib -m test -uall -x test_multiprocessing_fork -x test_multiprocessing_forkserver -x test_multiprocessing_spawn + after_script: # Probably should be after_success once test suite updated to run under coverage.py. + # Make the `coverage` command available to Codecov w/ a version of Python that can parse all source files. + - source ./venv/bin/activate + - bash <(curl -s https://codecov.io/bash) + - os: linux + language: cpp + compiler: clang + env: + - TESTING="C++ header compatibility" + before_script: + - ./configure + script: + - echo '#include "Python.h"' > test.cc && $CXX -c test.cc -o /dev/null -I ./Include -I . + +# Travis provides only 2 cores, so don't overdue the parallelism and waste memory. +before_script: + - ./configure --with-pydebug + - make -j4 + +script: + # `-r -w` implicitly provided through `make buildbottest`. + - make buildbottest TESTOPTS="-j4" + +notifications: + email: false + irc: + channels: + # This is set to a secure variable to prevent forks from notifying the + # IRC channel whenever they fail a build. This can be removed when travis + # implements https://github.com/travis-ci/travis-ci/issues/1094. + # The actual value here is: irc.freenode.net#python-dev + - secure: "s7kAkpcom2yUJ8XqyjFI0obJmhAGrn1xmoivdaPdgBIA++X47TBp1x4pgDsbEsoalef7bEwa4l07KdT4qa+DOd/c4QxaWom7fbN3BuLVsZuVfODnl79+gYq/TAbGfyH+yDs18DXrUfPgwD7C5aW32ugsqAOd4iWzfGJQ5OrOZzqzGjYdYQUEkJFXgxDEIb4aHvxNDWGO3Po9uKISrhb5saQ0l776yLo1Ur7M4oxl8RTbCdgX0vf5TzPg52BgvZpOgt3DHOUYPeiJLKNjAE6ibg0U95sEvMfHX77nz4aFY4/3UI6FFaRla34rZ+mYKrn0TdxOhera1QOgPmM6HzdO4K44FpfK1DS0Xxk9U9/uApq+cG0bU3W+cVUHDBe5+90lpRBAXHeHCgT7TI8gec614aiT8lEr3+yH8OBRYGzkjNK8E2LJZ/SxnVxDe7aLF6AWcoWLfS6/ziAIBFQ5Nc4U72CT8fGVSkl8ywPiRlvixKdvTODMSZo0jMqlfZSNaAPTsNRx4wu5Uis4qekwe32Fz4aB6KGpsuuVjBi+H6v0RKxNJNGY3JKDiEH2TK0UE2auJ5GvLW48aUVFcQMB7euCWYXlSWVRHh3WLU8QXF29Dw4JduRZqUpOdRgMHU79UHRq+mkE0jAS/nBcS6CvsmxCpTSrfVYuMOu32yt18QQoTyU=" + on_success: change + on_failure: always + skip_join: true From bfeb853c04a9887cc93743ddf0a8fc85a183f99d Mon Sep 17 00:00:00 2001 From: INADA Naoki Date: Sun, 12 Feb 2017 12:51:45 +0900 Subject: [PATCH 2/4] travis: remove coverage target, don't use venv for docs target --- .travis.yml | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1066e5fb1450be..a75d66369cc566 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,38 +20,17 @@ env: - TESTING=cpython matrix: - allow_failures: - - env: - - TESTING=coverage include: - os: linux language: python - python: 3.5 + python: 2.7 env: - TESTING=docs before_script: - cd Doc - - make venv PYTHON=python3 + - pip install -U Sphinx script: - - make html SPHINXBUILD="./venv/bin/python3 -m sphinx" SPHINXOPTS="-q" - - os: linux - language: c - compiler: clang - env: - - TESTING=coverage - before_script: - - ./configure - - make -s -j4 - # Need a venv that can parse covered code. - - ./python -m venv venv - - ./venv/bin/python -m pip install -U coverage - script: - # Skip tests that re-run the entire test suite. - - ./venv/bin/python -m coverage run --pylib -m test -uall -x test_multiprocessing_fork -x test_multiprocessing_forkserver -x test_multiprocessing_spawn - after_script: # Probably should be after_success once test suite updated to run under coverage.py. - # Make the `coverage` command available to Codecov w/ a version of Python that can parse all source files. - - source ./venv/bin/activate - - bash <(curl -s https://codecov.io/bash) + - make html SPHINXOPTS="-q" - os: linux language: cpp compiler: clang From 25407b2dd352b378835cf58c1e2555a92689b0a7 Mon Sep 17 00:00:00 2001 From: Berker Peksag Date: Tue, 14 Feb 2017 20:19:11 +0900 Subject: [PATCH 3/4] cherry-pick 157c0b8 --- .travis.yml | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index a75d66369cc566..7e7d07d5d7d9f3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,10 +27,17 @@ matrix: env: - TESTING=docs before_script: - - cd Doc + - | + if git diff --name-only $TRAVIS_COMMIT_RANGE | grep -qvE '^Doc/' + then + echo "Docs weren't updated, stopping build process." + exit + fi + cd Doc - pip install -U Sphinx script: - make html SPHINXOPTS="-q" + - python tools/rstlint.py -i tools -i venv - os: linux language: cpp compiler: clang @@ -43,8 +50,14 @@ matrix: # Travis provides only 2 cores, so don't overdue the parallelism and waste memory. before_script: - - ./configure --with-pydebug - - make -j4 + - | + if ! git diff --name-only $TRAVIS_COMMIT_RANGE | grep -qvE '(\.(rst|yml)$)|(^Doc)/' + then + echo "Only docs were updated, stopping build process." + exit + fi + ./configure --with-pydebug + make -j4 script: # `-r -w` implicitly provided through `make buildbottest`. From dcad9c1b3359b4ee59a64e1fc2e89f90b5e9e6a5 Mon Sep 17 00:00:00 2001 From: Berker Peksag Date: Tue, 14 Feb 2017 17:19:34 +0300 Subject: [PATCH 4/4] Use 'make check' instead of 'python3 tools/rstlint.py' (#96) --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7e7d07d5d7d9f3..b426d219a4e131 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,7 +37,7 @@ matrix: - pip install -U Sphinx script: - make html SPHINXOPTS="-q" - - python tools/rstlint.py -i tools -i venv + - make check - os: linux language: cpp compiler: clang