You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2017/03/30 15:20:53 UTC
qpid-proton git commit: NO-JIRA: Disable py33,
py34 TOX environments in travis.yml
Repository: qpid-proton
Updated Branches:
refs/heads/master edebc4ecf -> 81771b3d4
NO-JIRA: Disable py33,py34 TOX environments in travis.yml
Make the tox.ini envlist settable from cmake option TOX_ENVLIST
Update .travis.yml to exclude py33,py34 from the envlist as both cause failures.
cmake prints a warning if TOX_ENVLIST is set to any non-default value to remind
us that this is a temporary measure.
When the problem is fixed, revert .travis.yml to re-enable the defaults.
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/81771b3d
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/81771b3d
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/81771b3d
Branch: refs/heads/master
Commit: 81771b3d4ead43711b364e4a01c336212ff097d6
Parents: edebc4e
Author: Alan Conway <ac...@redhat.com>
Authored: Thu Mar 30 09:55:29 2017 -0400
Committer: Alan Conway <ac...@redhat.com>
Committed: Thu Mar 30 11:18:31 2017 -0400
----------------------------------------------------------------------
.travis.yml | 2 +-
DEVELOPERS.md | 5 ++++-
proton-c/CMakeLists.txt | 5 +++++
proton-c/tox.ini.in | 2 +-
4 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/81771b3d/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 49e44da..c556ece 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,6 +29,6 @@ before_script:
- export PATH=${HOME}/.local/bin:${PATH}
- mkdir Build
- cd Build
-- cmake .. -DCMAKE_INSTALL_PREFIX=$PWD/install
+- cmake .. -DCMAKE_INSTALL_PREFIX=$PWD/install -DTOX_ENVLIST="py26,py27,py35"
script:
- cmake --build . --target install && ctest -V
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/81771b3d/DEVELOPERS.md
----------------------------------------------------------------------
diff --git a/DEVELOPERS.md b/DEVELOPERS.md
index 63fff54..c64484c 100644
--- a/DEVELOPERS.md
+++ b/DEVELOPERS.md
@@ -49,10 +49,13 @@ development environments on your system. Most modern Linux
distributions support installing Python 2.x and Python 3.x in
parallel.
-2. Install the **tox** Python testing tool, (e.g. for Fedora):
+2. Install the **tox** Python testing tool, e.g. for older Fedora:
$ yum install python-tox
+ For newer fedora:
+
+ $ dnf install python3-tox redhat-rpm-config
To run the tests, cd into your build directory and use the following commands:
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/81771b3d/proton-c/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/proton-c/CMakeLists.txt b/proton-c/CMakeLists.txt
index 07b4f22..16da920 100644
--- a/proton-c/CMakeLists.txt
+++ b/proton-c/CMakeLists.txt
@@ -692,6 +692,11 @@ if (BUILD_PYTHON)
# the build for non linux plaforms, it doesn't make sense
# to try to run them.
option(TOX_TEST "Enable muti-version python testing with TOX" ON)
+ set(tox_default "py26,py27,py33,py34,py35")
+ set(TOX_ENVLIST ${tox_default} CACHE STRING "List of python environments for TOX tests" )
+ if (NOT (TOX_ENVLIST STREQUAL tox_default))
+ message(WARNING "non-default TOX test set '${TOX_ENVLIST}' (default '${tox_default}')")
+ endif()
if (CMAKE_SYSTEM_NAME STREQUAL Linux AND TOX_TEST)
find_program(TOX_EXE "tox")
if (CMAKE_BUILD_TYPE MATCHES "Coverage")
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/81771b3d/proton-c/tox.ini.in
----------------------------------------------------------------------
diff --git a/proton-c/tox.ini.in b/proton-c/tox.ini.in
index b7eda19..47ed3be 100644
--- a/proton-c/tox.ini.in
+++ b/proton-c/tox.ini.in
@@ -1,5 +1,5 @@
[tox]
-envlist = py26,py27,py33,py34,py35
+envlist = @TOX_ENVLIST@
minversion = 1.4
skipdist = True
setupdir = @py_bin@/dist
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org