Add dependency for concurrent.futures (#680)

Conditionally install futures in py27
This commit is contained in:
José Armando García Sancio
2016-07-08 17:18:39 -07:00
committed by GitHub
parent 6bd9fc0222
commit 95e7c53f5c
4 changed files with 23 additions and 17 deletions

View File

@@ -4,7 +4,7 @@ BASEDIR=`dirname $0`/..
if [ ! -d "$BASEDIR/env" ]; then
python3 -m venv $BASEDIR/env
virtualenv -p python3 -q $BASEDIR/env --prompt='(dcos) '
echo "Virtualenv created."
if [ -f "$BASEDIR/env/bin/activate" ]; then

View File

@@ -4,7 +4,7 @@ BASEDIR=`dirname $0`/..
if [ ! -d "$BASEDIR/env" ]; then
python3 -m venv $BASEDIR/env
virtualenv -p python3 -q $BASEDIR/env --prompt='(dcoscli) '
echo "Virtualenv created."
if [ -f "$BASEDIR/env/bin/activate" ]; then

View File

@@ -66,9 +66,9 @@ setup(
'dcos=={}'.format(dcoscli.version),
'docopt>=0.6, <1.0',
'pkginfo==1.2.1',
'rollbar>=0.9, <1.0',
'toml>=0.9, <1.0',
'virtualenv>=13.0, <16.0',
'rollbar>=0.9, <1.0'
],
# If there are data files included in your packages that need to be

View File

@@ -1,3 +1,4 @@
import sys
from codecs import open
from os import path
@@ -10,6 +11,24 @@ here = path.abspath(path.dirname(__file__))
with open(path.join(here, 'DESCRIPTION.rst'), encoding='utf-8') as f:
long_description = f.read()
install_requires = [
'gitpython>=1.0, <2.0',
'jsonschema==2.4', # pin the exact version, jsonschema 2.5 broke py3
'pager>=3.3, <4.0',
'portalocker>=0.5, <1.0',
'prettytable>=0.7, <1.0',
'pygments>=2.0, <3.0',
'pypng==0.0.18',
'pystache>=0.5, <1.0',
'requests>=2.6, <3.0',
'six>=1.9, <2.0',
'toml>=0.9, <1.0',
]
if sys.version_info[0] == 2:
install_requires.append('futures>=3.0, <4.0')
setup(
name='dcos',
@@ -62,20 +81,7 @@ setup(
# your project is installed. For an analysis of "install_requires" vs pip's
# requirements files see:
# https://packaging.python.org/en/latest/requirements.html
install_requires=[
'futures>=3.0, <4.0',
'gitpython>=1.0, <2.0',
'jsonschema==2.4', # pin the exact version, jsonschema 2.5 broke py3
'pager>=3.3, <4.0',
'portalocker>=0.5, <1.0',
'prettytable>=0.7, <1.0',
'pygments>=2.0, <3.0',
'pypng==0.0.18',
'pystache>=0.5, <1.0',
'requests>=2.6, <3.0',
'six>=1.9, <2.0',
'toml>=0.9, <1.0',
],
install_requires=install_requires,
package_data={
'dcos': [