Skip to content

Commit

Permalink
Merge 482fa98 into 5904d6c
Browse files Browse the repository at this point in the history
  • Loading branch information
rbikar committed Sep 19, 2019
2 parents 5904d6c + 482fa98 commit bbb1bc1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 18 deletions.
3 changes: 2 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
requests
more-executors
ubi-config
ubi-config
rpm-py-installer
18 changes: 1 addition & 17 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
from setuptools import setup
import pkg_resources


def get_description():
Expand All @@ -15,24 +14,9 @@ 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:
requirements.extend(f.read().splitlines())

return requirements
return f.read().splitlines()


setup(name='ubi-population-tool',
Expand Down

0 comments on commit bbb1bc1

Please sign in to comment.