You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by kl...@apache.org on 2018/11/19 16:29:55 UTC
[mesos] branch master updated (22fa5ae -> 2a89935)
This is an automated email from the ASF dual-hosted git repository.
klueska pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git.
from 22fa5ae Added a test `ROOT_UNPRIVILEGED_USER_SandboxOwnership`.
new 992b506 Updated new CLI test step to use binary created by PyInstaller.
new e7bd571 Added configuration docs describing how to use Python 3.
new 2a89935 Updated configuration docs describing how to build the new CLI.
The 3 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:
docs/configuration/autotools.md | 33 ++++++++++++++++++++++++++++++---
docs/configuration/cmake.md | 12 +++++++++++-
src/Makefile.am | 6 ++++--
src/python/cli_new/tests/CMakeLists.txt | 3 ++-
4 files changed, 47 insertions(+), 7 deletions(-)
[mesos] 03/03: Updated configuration docs describing how to build
the new CLI.
Posted by kl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
klueska pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git
commit 2a899351641c8defb7d677bad25fe2b479d1f0b6
Author: Armand Grillet <ag...@mesosphere.io>
AuthorDate: Mon Nov 19 10:50:47 2018 -0500
Updated configuration docs describing how to build the new CLI.
Review: https://reviews.apache.org/r/69381/
---
docs/configuration/autotools.md | 10 ++++++++++
docs/configuration/cmake.md | 3 ++-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/docs/configuration/autotools.md b/docs/configuration/autotools.md
index b85de19..55a5de8 100644
--- a/docs/configuration/autotools.md
+++ b/docs/configuration/autotools.md
@@ -201,6 +201,16 @@ layout: documentation
</tr>
<tr>
<td>
+ --enable-new-cli
+ </td>
+ <td>
+ Whether to build the new Python CLI. This option requires Python 3
+ which can be set using the PYTHON_3 environment variable.
+ [default=no]
+ </td>
+ </tr>
+ <tr>
+ <td>
--disable-python
</td>
<td>
diff --git a/docs/configuration/cmake.md b/docs/configuration/cmake.md
index 188c60a..554c3bf 100644
--- a/docs/configuration/cmake.md
+++ b/docs/configuration/cmake.md
@@ -162,7 +162,8 @@ See more information in the [CMake documentation](../cmake.md).
-DENABLE_NEW_CLI=(TRUE|FALSE)
</td>
<td>
- Build the new CLI instead of the old one. [default=FALSE]
+ Enable the new Python CLI by building a binary using PyInstaller. This option
+ requires Python 3 which can be set using the CMake option. [default=FALSE]
</td>
</tr>
<tr>
[mesos] 01/03: Updated new CLI test step to use binary created by
PyInstaller.
Posted by kl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
klueska pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git
commit 992b506e19829536b9407f04f4647af6642d9bec
Author: Armand Grillet <ag...@mesosphere.io>
AuthorDate: Mon Nov 19 10:41:13 2018 -0500
Updated new CLI test step to use binary created by PyInstaller.
The integration tests for the new CLI running while building Mesos now
directly use the binary created during the build. That way we make sure
that the binary created using PyInstaller is usable, which is the
artifact that we want to distribute to users in the future.
Previously, we were only activating the virtual environment to run the
tests thus the binary created by PyInstaller was never properly tested.
To use the binary created by PyInstaller, we simply update the PATH
before running 'mesos-cli-tests'.
Review: https://reviews.apache.org/r/69374/
---
src/Makefile.am | 6 ++++--
src/python/cli_new/tests/CMakeLists.txt | 3 ++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index c17eae4..2d9c81b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2820,9 +2820,11 @@ uninstall-hook:
# http://lists.gnu.org/archive/html/automake/2013-01/msg00051.html
check-local: tests
$(TEST_DRIVER) ./mesos-tests
+
if ENABLE_NEW_CLI
- @source $(builddir)/.virtualenv/bin/activate; \
- $(MESOS_CLI_SRCDIR)/bin/mesos-cli-tests
+ source $(builddir)/.virtualenv/bin/activate; \
+ source $(builddir)/.virtualenv/bin/postactivate; \
+ PATH=$(builddir):$$PATH mesos-cli-tests
endif
if INSTALL_TESTS
diff --git a/src/python/cli_new/tests/CMakeLists.txt b/src/python/cli_new/tests/CMakeLists.txt
index 19119d1..db7b234 100644
--- a/src/python/cli_new/tests/CMakeLists.txt
+++ b/src/python/cli_new/tests/CMakeLists.txt
@@ -22,7 +22,8 @@ if (ENABLE_NEW_CLI)
WRITE ${CMAKE_CURRENT_BINARY_DIR}/run_cli_tests.sh
"set -e
source ${CMAKE_CURRENT_BINARY_DIR}/../.virtualenv/bin/activate
- ${CMAKE_CURRENT_SOURCE_DIR}/../bin/mesos-cli-tests")
+ source ${CMAKE_CURRENT_BINARY_DIR}/../.virtualenv/bin/postactivate
+ PATH=${CMAKE_BINARY_DIR}/src:$PATH mesos-cli-tests")
add_custom_target(
cli-tests
[mesos] 02/03: Added configuration docs describing how to use
Python 3.
Posted by kl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
klueska pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git
commit e7bd571e5c8bb3a3b91f589b9a03d07320070e3e
Author: Armand Grillet <ag...@mesosphere.io>
AuthorDate: Mon Nov 19 10:49:28 2018 -0500
Added configuration docs describing how to use Python 3.
For Autotools, this means how to use 'PYTHON_3' and 'PYTHON_3_VERSION'.
For CMake, this means how to use '-DPYTHON_3'.
Review: https://reviews.apache.org/r/69380/
---
docs/configuration/autotools.md | 23 ++++++++++++++++++++---
docs/configuration/cmake.md | 9 +++++++++
2 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/docs/configuration/autotools.md b/docs/configuration/autotools.md
index 3c3c59a..b85de19 100644
--- a/docs/configuration/autotools.md
+++ b/docs/configuration/autotools.md
@@ -569,7 +569,7 @@ it to find libraries and programs with nonstandard names/locations.
PYTHON
</td>
<td>
- Which Python interpreter to use.
+ Which Python 2 interpreter to use.
</td>
</tr>
<tr>
@@ -577,8 +577,25 @@ it to find libraries and programs with nonstandard names/locations.
PYTHON_VERSION
</td>
<td>
- The installed Python version to use, for example '2.3'. This string will
- be appended to the Python interpreter canonical name.
+ The installed Python 2 version to use, for example '2.3'. This string will
+ be appended to the Python 2 interpreter canonical name.
+ </td>
+ </tr>
+ <tr>
+ <td>
+ PYTHON_3
+ </td>
+ <td>
+ Which Python 3 interpreter to use.
+ </td>
+ </tr>
+ <tr>
+ <td>
+ PYTHON_3_VERSION
+ </td>
+ <td>
+ The installed Python 3 version to use, for example '3.6'. This string will
+ be appended to the Python 3 interpreter canonical name.
</td>
</tr>
</table>
diff --git a/docs/configuration/cmake.md b/docs/configuration/cmake.md
index 0cba405..188c60a 100644
--- a/docs/configuration/cmake.md
+++ b/docs/configuration/cmake.md
@@ -167,6 +167,15 @@ See more information in the [CMake documentation](../cmake.md).
</tr>
<tr>
<td>
+ -DPYTHON_3=[path]
+ </td>
+ <td>
+ Specify the path to Python 3, e.g. "python36".
+ [default=unspecified]
+ </td>
+ </tr>
+ <tr>
+ <td>
-D3RDPARTY_DEPENDENCIES=[path_or_url]
</td>
<td>