Merge pull request #608 from fomars/release

PyOpenSSL dependency, fix cfg unpacking
yandex · Jun 4, 2018 · f06b872 · f06b872
2 parents 2b3ab38 + 0843207
commit f06b872
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/setup.py b/setup.py
@@ -20,7 +20,7 @@
         'pandas>=0.18.0', 'numpy>=1.12.1', 'future>=0.16.0',
         'pip>=8.1.2',
         'pyyaml>=3.12', 'cerberus==1.2', 'influxdb>=5.0.0',
-        'netort>=0.0.11'
+        'netort>=0.0.11', 'pyopenssl>=17.5.0'
     ],
     setup_requires=[
         'pytest-runner', 'flake8',

diff --git a/yandextank/core/consoleworker.py b/yandextank/core/consoleworker.py
@@ -248,7 +248,7 @@ def patch_ini_config_with_monitoring(ini_config, mon_section_name):
 def load_tank_core(config_files, cmd_options, no_rc, depr_options, other_opts, patches=None):
     if patches is None:
         patches = []
-    other_opts = list(other_opts) if other_opts else []
+    other_opts = [other_opts] if other_opts else []
     config_files = config_files if len(config_files) > 0 else [DEFAULT_CONFIG]
     if no_rc:
         configs = [load_cfg(cfg) for cfg in config_files] +\