|
8 | 8 | from parse import *
|
9 | 9 | from optparse import OptionParser
|
10 | 10 |
|
11 |
| -versions_list=['1.0.0', '1.1.0','1.2.0','1.3.0','1.4.0','1.4.1','1.5.0'] |
| 11 | +versions_list=['1.0.0', '1.1.0','1.2.0','1.3.0','1.4.0','1.4.1','1.5.0', '1.6.0', '1.7.0'] |
12 | 12 |
|
13 | 13 | res_modes_list=['relaxed', 'recommended', 'strict', 'custom']
|
14 | 14 |
|
@@ -102,11 +102,14 @@ def parse_ray_config(ray_version, sig_str, is_multiline):
|
102 | 102 | # get the default value and associated env variable
|
103 | 103 | if '?' in conf_default:
|
104 | 104 | # TODO: make the parsing conditions more general
|
105 |
| - if 'RAY_preallocate_plasma_memory' in conf_default and ray_version == '1.5.0': |
| 105 | + if 'RAY_preallocate_plasma_memory' in conf_default and ray_version in ['1.5.0', '1.6.0', '1.7.0']: |
106 | 106 | conf_env = 'RAY_preallocate_plasma_memory'
|
107 | 107 | _, conf_default = parse('{}: {})', conf_default)
|
| 108 | + elif 'getenv' in conf_default: |
| 109 | + conf_env,_,conf_default = parse('getenv("{}"){}: {})', conf_default) |
108 | 110 | else:
|
109 |
| - _, conf_env,_, conf_default = parse('{} ? {} : {}("{}"))', conf_default) |
| 111 | + print(conf_default) |
| 112 | + _, conf_env,_, conf_default = parse('{} ? {} : {}("{}"))', conf_default) |
110 | 113 | elif 'getenv' in conf_default:
|
111 | 114 | _, conf_env, is_eq, _, conf_default = parse('{} getenv("{}") {} std::{}("{}"))', conf_default)
|
112 | 115 | if is_eq == "!=" and conf_type == "bool":
|
|
0 commit comments