Skip to content

Commit

Permalink
Merge pull request #3087 from grembo/master
Browse files Browse the repository at this point in the history
Only require 'distro' on linux (as it is linux specific)
  • Loading branch information
tardyp committed Apr 19, 2017
2 parents 3dfacb4 + cc91178 commit 17cfe5b
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion master/setup.py
Expand Up @@ -25,11 +25,13 @@
import glob
import os
import pkg_resources
import platform
import sys
from distutils.command.install_data import install_data
from distutils.command.sdist import sdist
from distutils.version import LooseVersion

from setuptools import version as setuptools_version
from setuptools import setup

from buildbot import version
Expand Down Expand Up @@ -454,9 +456,14 @@ def define_plugin_entries(groups):
'txaio ' + txaio_ver,
'autobahn ' + autobahn_ver,
'PyJWT',
'distro'
]

# based on https://discourse.numenta.org/t/setup-py-error-invalid-environment-marker/1298/4
if LooseVersion(setuptools_version.__version__) >= LooseVersion("20.2.2"):
setup_args['install_requires'].append('distro;platform_system==="Linux"')
elif platform.system() == 'Linux':
setup_args['install_requires'].append('distro')

# Unit test dependencies.
test_deps = [
# http client libraries
Expand Down

0 comments on commit 17cfe5b

Please sign in to comment.