From 97cbaba4c775f167bab067a827962579bd70a3c9 Mon Sep 17 00:00:00 2001 From: Timo Stollenwerk Date: Mon, 1 Oct 2018 20:17:07 +0200 Subject: [PATCH 1/9] Run Python3 tests on Travis. --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 24ac8f2f29..dc9b52ad57 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,8 @@ language: python -python: "2.7" +python: + - 2.7 + - 3.6 + - 3.7 sudo: required services: - docker From 0b61a06d356b3957634bc446bdd585dbc7cdb6cb Mon Sep 17 00:00:00 2001 From: Timo Stollenwerk Date: Mon, 1 Oct 2018 20:19:20 +0200 Subject: [PATCH 2/9] Allow Python 3 builds on Travis to fail. --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index dc9b52ad57..ec58dfbe41 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,9 @@ env: - PLONE_VERSION=4.3.x - PLONE_VERSION=5.0.x - PLONE_VERSION=5.1.x + allow_failures: + - python: 3.6 + - python: 3.7 before_install: - mkdir -p $HOME/buildout-cache/{eggs,downloads} - mkdir $HOME/.buildout From 7981508150122a0992bb7827c94c1d0d66f0ae8e Mon Sep 17 00:00:00 2001 From: Timo Stollenwerk Date: Mon, 1 Oct 2018 21:17:08 +0200 Subject: [PATCH 3/9] Travis uses py 3.5 and 3.6. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ec58dfbe41..1409db6e27 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,8 @@ language: python python: - 2.7 + - 3.5 - 3.6 - - 3.7 sudo: required services: - docker @@ -19,8 +19,8 @@ env: - PLONE_VERSION=5.0.x - PLONE_VERSION=5.1.x allow_failures: + - python: 3.5 - python: 3.6 - - python: 3.7 before_install: - mkdir -p $HOME/buildout-cache/{eggs,downloads} - mkdir $HOME/.buildout From 0e779a6eff6a1d7d38b0876e2f508578053800f0 Mon Sep 17 00:00:00 2001 From: Timo Stollenwerk Date: Mon, 1 Oct 2018 22:17:42 +0200 Subject: [PATCH 4/9] Move matrix to top-level on travis conf. --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1409db6e27..4c5a3e548b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,9 +18,10 @@ env: - PLONE_VERSION=4.3.x - PLONE_VERSION=5.0.x - PLONE_VERSION=5.1.x - allow_failures: - - python: 3.5 - - python: 3.6 +matrix: + allow_failures: + - python: 3.5 + - python: 3.6 before_install: - mkdir -p $HOME/buildout-cache/{eggs,downloads} - mkdir $HOME/.buildout From bd93a472c145ccd7649878c96c2f124921d412d6 Mon Sep 17 00:00:00 2001 From: Timo Stollenwerk Date: Tue, 2 Oct 2018 07:19:42 +0200 Subject: [PATCH 5/9] Add Plone 5.2 and explicitly run matrix jobs (py3 for just 5.2). --- .travis.yml | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4c5a3e548b..47640581ad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,10 +18,21 @@ env: - PLONE_VERSION=4.3.x - PLONE_VERSION=5.0.x - PLONE_VERSION=5.1.x + - PLONE_VERSION=5.2.x matrix: - allow_failures: - - python: 3.5 - - python: 3.6 + include: + - python: "2.7" + env: PLONE_VERSION=4.3.x + - python: "2.7" + env: PLONE_VERSION=5.0.x + - python: "2.7" + env: PLONE_VERSION=5.1.x + - python: "2.7" + env: PLONE_VERSION=5.2.x + - python: "3.5" + env: PLONE_VERSION=5.2.x + - python: "3.5" + env: PLONE_VERSION=5.2.x before_install: - mkdir -p $HOME/buildout-cache/{eggs,downloads} - mkdir $HOME/.buildout From b5f6e14405e7af77f1715877b1e7774eea0ce3a9 Mon Sep 17 00:00:00 2001 From: Timo Stollenwerk Date: Tue, 2 Oct 2018 07:22:56 +0200 Subject: [PATCH 6/9] Add dummy plone-5.2.x.cfg and run py 3.6 on Travis only for now. --- .travis.yml | 9 +++------ plone-5.2.x.cfg | 5 +++++ 2 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 plone-5.2.x.cfg diff --git a/.travis.yml b/.travis.yml index 47640581ad..e2a00c4d25 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,7 @@ language: python python: - - 2.7 - - 3.5 - - 3.6 + - "2.7" + - "3.6" sudo: required services: - docker @@ -29,9 +28,7 @@ matrix: env: PLONE_VERSION=5.1.x - python: "2.7" env: PLONE_VERSION=5.2.x - - python: "3.5" - env: PLONE_VERSION=5.2.x - - python: "3.5" + - python: "3.6" env: PLONE_VERSION=5.2.x before_install: - mkdir -p $HOME/buildout-cache/{eggs,downloads} diff --git a/plone-5.2.x.cfg b/plone-5.2.x.cfg new file mode 100644 index 0000000000..5bb3a958f4 --- /dev/null +++ b/plone-5.2.x.cfg @@ -0,0 +1,5 @@ +[buildout] +extends = + base.cfg + http://dist.plone.org/release/5.1.2/versions.cfg + versions.cfg From b8167d54c3bde50366179b39baac5f47e1169620 Mon Sep 17 00:00:00 2001 From: Timo Stollenwerk Date: Tue, 2 Oct 2018 07:25:12 +0200 Subject: [PATCH 7/9] Travis: Remove matrix from env. --- .travis.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index e2a00c4d25..9c05a2b3dc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,11 +13,6 @@ env: global: - secure: "tj9kO7Uyn7AY2Z6zhdOggLSYheaD8e+qKA7ZXvdWTrL2HtPAtnNJK8keQGj1JLQyy6bRfoOCt51aL8+Lc0fzcACaLFpAPjleSLtUChphPOh/dqTu1QX5oL0SxZ94B4ZC5+qfaSAQHMwbiiWUW0us9QtJpxQQmiJUekqiTdQDNEo=" - secure: "j06un+j2gHjlGfg+xMcvKG2osf1HSzBq/cPPNIonnjGQY3GJfT/YRzYnHe5LJPPt7IJDD7hAEPentRJ4C0zP66U6gcQ2HjWPsMIcvzlgnXoT2QaaCVkMA9YS4WOsN0C5iY/R64GjFwR7J+/bgeG64XvfhpuQ/UBP2+U68PqSBtM=" - matrix: - - PLONE_VERSION=4.3.x - - PLONE_VERSION=5.0.x - - PLONE_VERSION=5.1.x - - PLONE_VERSION=5.2.x matrix: include: - python: "2.7" From 7f7394c87163d599231bb8b99827cc9e7f585737 Mon Sep 17 00:00:00 2001 From: Timo Stollenwerk Date: Tue, 2 Oct 2018 07:28:17 +0200 Subject: [PATCH 8/9] Try to exclude py2/3 without any Plone version env var set. --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 9c05a2b3dc..8b24b07683 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,6 +25,9 @@ matrix: env: PLONE_VERSION=5.2.x - python: "3.6" env: PLONE_VERSION=5.2.x + exclude: + - python: "2.7" + - python: "3.6" before_install: - mkdir -p $HOME/buildout-cache/{eggs,downloads} - mkdir $HOME/.buildout From a706e16ae1fac4ffcf6a1c835d72bcd6c61a45cf Mon Sep 17 00:00:00 2001 From: Timo Stollenwerk Date: Tue, 2 Oct 2018 09:05:31 +0200 Subject: [PATCH 9/9] Allow Plone 5.2 to fail with Py3. --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 8b24b07683..da110928bd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,6 +28,9 @@ matrix: exclude: - python: "2.7" - python: "3.6" + allow_failures: + - python: "3.6" + env: PLONE_VERSION=5.2.x before_install: - mkdir -p $HOME/buildout-cache/{eggs,downloads} - mkdir $HOME/.buildout