altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

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'.

Browse source 
- Legacy-Id: 13723
This commit is contained in:
Henrik Levkowetz 2017-06-28 11:53:09 +00:00
parent 6cd18d6324
commit 3b7f320c29
2 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ietf/submit/checkers.py
View file

@ -157,12 +157,7 @@ class DraftYangChecker(object):
sys.stdout = saved_stdout sys.stdout = saved_stdout
sys.stderr = saved_stderr sys.stderr = saved_stderr
# signature change in xym: # signature change in xym:
if xym.__version__.startswith('0.3'): model_list = extractor.get_extracted_models(False)
model_list = extractor.get_extracted_models()
elif xym.__version__.startswith('0.4'):
model_list = extractor.get_extracted_models(force_revision=False)
else:
raise ValueError("Unexpected version of xym found: %s" % xym.__version__)
except Exception as exc: except Exception as exc:
msg = "Exception when running xym on %s: %s" % (name, exc) msg = "Exception when running xym on %s: %s" % (name, exc)
log(msg) log(msg)
@ -174,7 +169,6 @@ class DraftYangChecker(object):
for m in model_list: for m in model_list:
if not re.search(model_name_re, m): if not re.search(model_name_re, m):
debug.debug = True
code += 1 code += 1
err += "Error: Bad extracted model name: '%s'\n" % m err += "Error: Bad extracted model name: '%s'\n" % m
@ -268,7 +262,6 @@ class DraftYangChecker(object):
"items": items, "items": items,
}) })
shutil.rmtree(workdir) shutil.rmtree(workdir)
passed = all( res["passed"] for res in results ) passed = all( res["passed"] for res in results )

2
requirements.txt
View file

@ -51,6 +51,6 @@ Trac>=1.0.10,<1.2
Unidecode>=0.4.18 Unidecode>=0.4.18
#wsgiref>=0.1.2 #wsgiref>=0.1.2
xml2rfc>=2.5.0,!=2.6.0 xml2rfc>=2.5.0,!=2.6.0
xym>=0.3.2 xym==0.4
#zxcvbn-python>=4.4.14 # Not needed until we do back-end password entropy validation #zxcvbn-python>=4.4.14 # Not needed until we do back-end password entropy validation