You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bb...@apache.org on 2018/08/31 08:16:11 UTC

[mesos] 01/02: Simplified Python dependencies management.

This is an automated email from the ASF dual-hosted git repository.

bbannier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git

commit f5b6f94086b73a06526f327ddd80b3f94141a667
Author: Armand Grillet <ag...@mesosphere.io>
AuthorDate: Fri Aug 31 09:49:56 2018 +0200

    Simplified Python dependencies management.
    
    Following the upgrade of the Python package to Python 3.6, tox handles
    dependencies for the new CLI and the Mesos Python package (MESOS-8206).
    
    Review: https://reviews.apache.org/r/68535/
---
 support/build-virtualenv     | 11 -----------
 support/pip-requirements.txt |  4 +++-
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/support/build-virtualenv b/support/build-virtualenv
index eb63464..90e1fc8 100755
--- a/support/build-virtualenv
+++ b/support/build-virtualenv
@@ -84,17 +84,6 @@ source ${VIRTUALENV_DIRECTORY}/bin/activate
 pip install --upgrade pip
 pip install -r ${CURRDIR}/pip-requirements.txt
 
-# For now we hard code pulling in the pip-requirements from the python
-# CLI's virtualenv in addition to our own pip-requirements for the
-# linter virtualenv. In the future, we need to make this more generic
-# to support multiple lintable python projects each with their own
-# virtualenvs (and potentially conflicting libraries).
-#
-# We have opened a JIRA ticket to track this:
-# https://issues.apache.org/jira/browse/MESOS-8206
-pip install -r ${CURRDIR}/../src/python/cli_new/pip-requirements.txt
-pip install -r ${CURRDIR}/../src/python/lib/requirements.in
-
 # Add Node.js virtual environment to the existing virtual environment.
 nodeenv -p
 
diff --git a/support/pip-requirements.txt b/support/pip-requirements.txt
index 89c2de2..e3fbcc2 100644
--- a/support/pip-requirements.txt
+++ b/support/pip-requirements.txt
@@ -1,2 +1,4 @@
 nodeenv==1.3.1
-pylint==1.9.2
+pylint==1.9.2; python_version < '3.0'
+pylint==2.1.1; python_version >= '3.0'
+tox==3.2.1; python_version >= '3.0'