summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach Marano <zmarano@google.com>2018-02-21 17:45:58 -0800
committerGitHub <noreply@github.com>2018-02-21 17:45:58 -0800
commitc915e8855ba7c7a1446ce4b898f241b4c6a39a32 (patch)
treed4ad71170fa776fd3b5a1aeab9a606023f06a8e8
parente07ddc4fce67518cddf7e0d56e566f0626a5dc8b (diff)
downloadgoogle-compute-image-packages-c915e8855ba7c7a1446ce4b898f241b4c6a39a32.tar.gz
Fix dependencies in setup.py to work in EL7. (#559)
Environment markers don't work on older python versions (EL7).
-rwxr-xr-xsetup.py3
-rw-r--r--tox.ini2
2 files changed, 3 insertions, 2 deletions
diff --git a/setup.py b/setup.py
index c745b35..02c993e 100755
--- a/setup.py
+++ b/setup.py
@@ -24,8 +24,9 @@ setuptools.setup(
author='Google Compute Engine Team',
author_email='gc-team@google.com',
description='Google Compute Engine',
+ extra_require={":python_version>='3.5'": ["distro"]},
include_package_data=True,
- install_requires=['boto', 'setuptools', 'distro;python_version>="3.5"'],
+ install_requires=['boto', 'setuptools'],
license='Apache Software License',
long_description='Google Compute Engine guest environment.',
name='google-compute-engine',
diff --git a/tox.ini b/tox.ini
index 6d543ee..8b75d39 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,7 +3,7 @@ envlist = py26,py27,py32,py33,py34,py35,pypy,pypy3
[testenv]
deps =
- py35: distro
+ py{35,36}: distro
setuptools>=20
pytest
pytest-cov