diff --git a/requirements.txt b/requirements.txt index 4edd1f6..b2b7a3e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,3 @@ requests more-executors -ubi-config -rpm-py-installer +ubi-config \ No newline at end of file diff --git a/setup.py b/setup.py index 2d7091b..3734560 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,5 @@ from setuptools import setup +import pkg_resources def get_description(): @@ -14,9 +15,24 @@ def get_long_description(): return text[idx:] +def get_rpm_distribution(): + for distribution in ['rpm', 'rpm-python']: + try: + pkg_resources.get_distribution(distribution) + except pkg_resources.DistributionNotFound: + continue + else: + return distribution + return 'rpm-py-installer' + + def get_requirements(): + requirements = [get_rpm_distribution()] + with open('requirements.txt') as f: - return f.read().splitlines() + requirements.extend(f.read().splitlines()) + + return requirements setup(name='ubi-population-tool',