diff options
| author | William Deegan <bill@baddogconsulting.com> | 2019-03-04 16:49:33 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-04 16:49:33 -0500 |
| commit | 56198e138a677e67a8beec2dcb2d33c0b8dd0a32 (patch) | |
| tree | c94c63715eb8637f0317b55727ce87c58f79ec7b | |
| parent | d6f6ae54248286a4501f683654f1bc54a2ade591 (diff) | |
| parent | 311c0b107aa468af800b4d06f43316a7412d52a2 (diff) | |
| download | scons-git-56198e138a677e67a8beec2dcb2d33c0b8dd0a32.tar.gz | |
Merge pull request #3323 from mwichmann/add-pypy3
[WIP] add pypy3 to the Travis CI setup
| -rw-r--r-- | .travis.yml | 17 | ||||
| -rwxr-xr-x | .travis/install.sh | 4 |
2 files changed, 16 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 3ab601a41..9df50d235 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ install: # allow coverage to fail, so we can still do testing for all platforms matrix: allow_failures: - - python: pypy + - python: pypy, pypy3 - stage: Coverage # run coverage first as its still useful to collect @@ -30,7 +30,7 @@ jobs: include: - &test_job stage: Test - script: python runtest.py -a || if [[ $? == 2 ]]; then true; else false; fi + script: python runtest.py -a -t || if [[ $? == 2 ]]; then true; else false; fi before_script: skip after_success: skip python: 2.7 @@ -61,13 +61,24 @@ jobs: sudo: required dist: xenial # required for Python 3.7 (travis-ci/travis-ci#9069) - - <<: *test_job + - &slow_test_job + stage: Test + script: python runtest.py -a -j 4 -t || if [[ $? == 2 ]]; then true; else false; fi + before_script: skip + after_success: skip python: pypy env: - PYVER=pypy - PYTHON=pypy sudo: required + - <<: *slow_test_job + python: pypy3 + env: + - PYVER=pypy3 + - PYTHON=pypy3 + sudo: required + - &coverage_jobs stage: Coverage diff --git a/.travis/install.sh b/.travis/install.sh index 6510f17d7..feb3dd493 100755 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -23,8 +23,8 @@ else sudo apt-get -y install gdc # dependencies for docbook tests sudo apt-get -y install docbook-xml xsltproc libxml2-dev libxslt-dev fop docbook-xsl-doc-pdf - # dependencies for latex tests - sudo apt-get -y install texlive texlive-latex3 biber texmaker ghostscript + # dependencies for latex tests (try to skip the huge doc pkgs) + sudo apt-get -y --no-install-recommends install texlive texlive-latex3 biber texmaker ghostscript # need some things for building dependencies for other tests sudo apt-get -y install python-pip python-dev build-essential libpcre3-dev autoconf automake libtool bison subversion git # dependencies for docbook tests continued |