From 3f3edd29e1f69b5b50c27439cf59286887a9178f Mon Sep 17 00:00:00 2001 From: Mats Wichmann Date: Sun, 3 Mar 2019 12:17:48 -0700 Subject: [WIP] add pypy3 to the Travis CI setup Signed-off-by: Mats Wichmann --- .travis.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3ab601a..6bc50c3 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: pypy2, pypy3 - stage: Coverage # run coverage first as its still useful to collect @@ -62,12 +62,19 @@ jobs: dist: xenial # required for Python 3.7 (travis-ci/travis-ci#9069) - <<: *test_job - python: pypy + python: pypy2 env: - PYVER=pypy - PYTHON=pypy sudo: required + - <<: *test_job + python: pypy3 + env: + - PYVER=pypy3 + - PYTHON=pypy3 + sudo: required + - &coverage_jobs stage: Coverage -- cgit v0.12 From 9e857aa8197bc12b7309527e10b2a31bd9601f59 Mon Sep 17 00:00:00 2001 From: Mats Wichmann Date: Mon, 4 Mar 2019 09:52:54 -0700 Subject: [PYPY] travis run pypy jobs with -j 3 The pypy test runs are markedly slower; try multi-job runs to see if they speed up enough to not time out our overall build. Signed-off-by: Mats Wichmann --- .travis.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6bc50c3..2609069 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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,14 +61,18 @@ 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 3 -t || if [[ $? == 2 ]]; then true; else false; fi + before_script: skip + after_success: skip python: pypy2 env: - PYVER=pypy - PYTHON=pypy sudo: required - - <<: *test_job + - <<: *slow_test_job python: pypy3 env: - PYVER=pypy3 -- cgit v0.12 From 0c02062ec5ca6f972838637e2ffb9a0132d5e1af Mon Sep 17 00:00:00 2001 From: Mats Wichmann Date: Mon, 4 Mar 2019 11:41:04 -0700 Subject: [PYPY] further adjust travis-ci pypy3 build Signed-off-by: Mats Wichmann --- .travis.yml | 5 +++-- .travis/install.sh | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2609069..967e0d9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -63,10 +63,10 @@ jobs: - &slow_test_job stage: Test - script: python runtest.py -a -j 3 -t || if [[ $? == 2 ]]; then true; else false; fi + script: python runtest.py -a -j 4 -t || if [[ $? == 2 ]]; then true; else false; fi before_script: skip after_success: skip - python: pypy2 + python: pypy env: - PYVER=pypy - PYTHON=pypy @@ -78,6 +78,7 @@ jobs: - PYVER=pypy3 - PYTHON=pypy3 sudo: required + dist: xenial - &coverage_jobs diff --git a/.travis/install.sh b/.travis/install.sh index 6510f17..feb3dd4 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 -- cgit v0.12 From 311c0b107aa468af800b4d06f43316a7412d52a2 Mon Sep 17 00:00:00 2001 From: Mats Wichmann Date: Mon, 4 Mar 2019 12:46:00 -0700 Subject: [PYPY] don't specify xenial for pypy3 Signed-off-by: Mats Wichmann --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 967e0d9..9df50d2 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: pypy2, pypy3 + - python: pypy, pypy3 - stage: Coverage # run coverage first as its still useful to collect @@ -78,7 +78,6 @@ jobs: - PYVER=pypy3 - PYTHON=pypy3 sudo: required - dist: xenial - &coverage_jobs -- cgit v0.12