diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000..cedffaa --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1 @@ +recursive-exclude tests * \ No newline at end of file diff --git a/setup.py b/setup.py index 4d3f039..907e8bd 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ from setuptools import setup, find_packages setup( name='yandextank', - version='1.7.1', + version='1.7.2', description='a performance measurement tool', longer_description=''' Yandex.Tank is a performance measurement and load testing automatization tool. @@ -18,7 +18,8 @@ analytic tools for the results they produce. maintainer='Alexey Lavrenuke (load testing)', maintainer_email='direvius@yandex-team.ru', url='http://yandex.github.io/yandex-tank/', - packages=find_packages(), + packages=find_packages(exclude=["tests"]), + include_package_data=True, install_requires=[ 'psutil', 'ipaddr', @@ -46,6 +47,7 @@ analytic tools for the results they produce. ], }, package_data={ + 'yandextank.core': ['config/*'], 'yandextank.plugins.GraphiteUploader': ['config/*'], 'yandextank.plugins.JMeter': ['config/*'], 'yandextank.plugins.Monitoring': ['config/*'], @@ -54,9 +56,6 @@ analytic tools for the results they produce. }, # TODO: move them all to resources maybe data_files=[ - ('/etc/yandex-tank', [ - 'config/00-base.ini', - ]), ('/etc/bash_completion.d', [ 'data/yandex-tank.completion' ]), diff --git a/config/00-base.ini b/yandextank/core/config/00-base.ini similarity index 100% rename from config/00-base.ini rename to yandextank/core/config/00-base.ini diff --git a/yandextank/core/consoleworker.py b/yandextank/core/consoleworker.py index ad5b20b..5ede54b 100644 --- a/yandextank/core/consoleworker.py +++ b/yandextank/core/consoleworker.py @@ -8,7 +8,7 @@ import time import traceback import signal from optparse import OptionParser - +from pkg_resources import resource_file from tankcore import TankCore @@ -151,7 +151,8 @@ class ConsoleTank: def get_default_configs(self): """ returns default configs list, from /etc and home dir """ - configs = [] + # initialize basic defaults + configs = [resource_file(__name__, '00-base.ini')] try: conf_files = os.listdir(self.baseconfigs_location) conf_files.sort()