You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ch...@apache.org on 2021/04/11 16:58:46 UTC
[qpid-cpp] branch feature/QPID-8517-parallel-ci-py2-py3 updated
(1b8eb5b -> 2adc34d)
This is an automated email from the ASF dual-hosted git repository.
chrisr pushed a change to branch feature/QPID-8517-parallel-ci-py2-py3
in repository https://gitbox.apache.org/repos/asf/qpid-cpp.git.
discard 1b8eb5b QPID-8517 Build and test in parallel for python2 and python3
discard 816a176 QPID-8517 Build and test in parallel for python2 and python3
discard 16cf7f5 QPID-8517 Build and test in parallel for python2 and python3
new e80b586 QPID-8517 Build and test in parallel for python2 and python3
new 2adc34d QPID-8516 Fix use of python2 in CMakeFiles excerpts
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (1b8eb5b)
\
N -- N -- N refs/heads/feature/QPID-8517-parallel-ci-py2-py3 (2adc34d)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
bindings/CMakeLists.txt | 2 +-
bindings/qpid/python/extra_dist/CMakeLists.txt | 2 +-
managementgen/CMakeLists.txt | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[qpid-cpp] 02/02: QPID-8516 Fix use of python2 in CMakeFiles
excerpts
Posted by ch...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
chrisr pushed a commit to branch feature/QPID-8517-parallel-ci-py2-py3
in repository https://gitbox.apache.org/repos/asf/qpid-cpp.git
commit 2adc34d369a8f120a16bd4bab7e46bec36efe898
Author: Chris Richardson <ch...@dyson.com>
AuthorDate: Thu Apr 8 16:43:07 2021 +0000
QPID-8516 Fix use of python2 in CMakeFiles excerpts
---
bindings/CMakeLists.txt | 2 +-
bindings/qpid/python/extra_dist/CMakeLists.txt | 2 +-
managementgen/CMakeLists.txt | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/bindings/CMakeLists.txt b/bindings/CMakeLists.txt
index 48c6e3d..947e308 100644
--- a/bindings/CMakeLists.txt
+++ b/bindings/CMakeLists.txt
@@ -119,7 +119,7 @@ if (SWIG_FOUND)
if (BUILD_BINDING_PYTHON)
message(STATUS "Building Python bindings")
execute_process(COMMAND ${PYTHON_EXECUTABLE}
- -c "from distutils.sysconfig import get_python_lib; print get_python_lib(True, prefix='${CMAKE_INSTALL_PREFIX}')"
+ -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(True, prefix='${CMAKE_INSTALL_PREFIX}'))"
OUTPUT_VARIABLE PYTHON_SITEARCH_PACKAGES
OUTPUT_STRIP_TRAILING_WHITESPACE)
diff --git a/bindings/qpid/python/extra_dist/CMakeLists.txt b/bindings/qpid/python/extra_dist/CMakeLists.txt
index 8ddd786..3f3bf67 100644
--- a/bindings/qpid/python/extra_dist/CMakeLists.txt
+++ b/bindings/qpid/python/extra_dist/CMakeLists.txt
@@ -31,7 +31,7 @@ INCLUDE (FindPythonLibs REQUIRED)
## -------------
EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE}
- -c "from distutils.sysconfig import get_python_lib; print get_python_lib(True, prefix='${CMAKE_INSTALL_PREFIX}')"
+ -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(True, prefix='${CMAKE_INSTALL_PREFIX}'))"
OUTPUT_VARIABLE PYTHON_SITEARCH_PACKAGES
OUTPUT_STRIP_TRAILING_WHITESPACE)
diff --git a/managementgen/CMakeLists.txt b/managementgen/CMakeLists.txt
index 1bb8db8..f44cc15 100644
--- a/managementgen/CMakeLists.txt
+++ b/managementgen/CMakeLists.txt
@@ -25,7 +25,7 @@ if (INSTALL_QMFGEN)
find_package(PythonInterp REQUIRED)
execute_process(COMMAND ${PYTHON_EXECUTABLE}
- -c "from distutils.sysconfig import get_python_lib; print get_python_lib(False, prefix='${CMAKE_INSTALL_PREFIX}').replace('\\\\', '/')"
+ -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(False, prefix='${CMAKE_INSTALL_PREFIX}').replace('\\\\', '/'))"
OUTPUT_VARIABLE PYTHON_SITEARCH_PACKAGES
OUTPUT_STRIP_TRAILING_WHITESPACE)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[qpid-cpp] 01/02: QPID-8517 Build and test in parallel for python2
and python3
Posted by ch...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
chrisr pushed a commit to branch feature/QPID-8517-parallel-ci-py2-py3
in repository https://gitbox.apache.org/repos/asf/qpid-cpp.git
commit e80b58671c04c7bffdf32a7309b08d4b8bf94e90
Author: Chris Richardson <ch...@dyson.com>
AuthorDate: Sun Apr 11 14:06:30 2021 +0100
QPID-8517 Build and test in parallel for python2 and python3
---
.travis.yml | 43 +++++++++++++++++++++++++++----------------
1 file changed, 27 insertions(+), 16 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 4633621..f84e54a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,11 @@
os:
- linux
-sudo: false
language:
-- c
- cpp
cache: ccache
addons:
apt:
packages:
- - cmake
- libboost-dev
- libboost-program-options-dev
- libboost-system-dev
@@ -19,19 +16,33 @@ addons:
- libsasl2-dev
- sasl2-bin
- swig
- - python-dev
- valgrind
- ruby
-before_install:
-- export PATH=/home/travis/.local/bin:$PATH
-- export PYTHONPATH=/home/travis/.local/lib/python2.7/site-packages:$PYTHONPATH
-install:
-- pip install --user --upgrade pip
-- pip install --user qpid-python
-before_script:
-- mkdir Build
-- cd Build
-- cmake .. -DCMAKE_INSTALL_PREFIX=$PWD/install
-script:
-- make -j3 && make install && ctest -V
+
+jobs:
+ include:
+ - name: "Build and test under python2"
+ distro: bionic
+ before_install:
+ - export PATH=/home/travis/.local/bin:$PATH
+ - export PYTHONPATH=/home/travis/.local/lib/python2.7/site-packages:$PYTHONPATH
+ install:
+ - pip install --user --upgrade pip
+ - pip install --user qpid-python
+ before_script:
+ - mkdir Build
+ - cd Build
+ - pyenv versions
+ - cmake .. -DCMAKE_INSTALL_PREFIX=$PWD/install -DPYTHON_EXECUTABLE="$(which python2)"
+ script:
+ - make -j$(nproc) && make install && ctest -V
+ - name: "Build and test under python3"
+ distro: focal
+ before_script:
+ - mkdir Build
+ - cd Build
+ - pyenv versions
+ - PYENV_VERSION="3.8.3" cmake .. -DCMAKE_INSTALL_PREFIX=$PWD/install -DPYTHON_EXECUTABLE="$(which python3)"
+ script:
+ - make -j$(nproc) && make install && ctest -V
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org