Skip to content

Commit 3b7f320

Browse files
committed
Removed the copy of xym copied directly from repository -- the method call we use is too unstable at the moment. Now requiring xym=='0.4'.
- Legacy-Id: 13723
1 parent 6cd18d6 commit 3b7f320

2 files changed

Lines changed: 2 additions & 9 deletions

File tree

ietf/submit/checkers.py

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -157,12 +157,7 @@ def check_file_txt(self, path):
157157
sys.stdout = saved_stdout
158158
sys.stderr = saved_stderr
159159
# signature change in xym:
160-
if xym.__version__.startswith('0.3'):
161-
model_list = extractor.get_extracted_models()
162-
elif xym.__version__.startswith('0.4'):
163-
model_list = extractor.get_extracted_models(force_revision=False)
164-
else:
165-
raise ValueError("Unexpected version of xym found: %s" % xym.__version__)
160+
model_list = extractor.get_extracted_models(False)
166161
except Exception as exc:
167162
msg = "Exception when running xym on %s: %s" % (name, exc)
168163
log(msg)
@@ -174,7 +169,6 @@ def check_file_txt(self, path):
174169

175170
for m in model_list:
176171
if not re.search(model_name_re, m):
177-
debug.debug = True
178172
code += 1
179173
err += "Error: Bad extracted model name: '%s'\n" % m
180174

@@ -268,7 +262,6 @@ def check_file_txt(self, path):
268262
"items": items,
269263
})
270264

271-
272265
shutil.rmtree(workdir)
273266

274267
passed = all( res["passed"] for res in results )

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,6 @@ Trac>=1.0.10,<1.2
5151
Unidecode>=0.4.18
5252
#wsgiref>=0.1.2
5353
xml2rfc>=2.5.0,!=2.6.0
54-
xym>=0.3.2
54+
xym==0.4
5555
#zxcvbn-python>=4.4.14 # Not needed until we do back-end password entropy validation
5656

0 commit comments

Comments
 (0)