From 3b7f320c29dc230d59f60efd378fdcce0903fccf Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Wed, 28 Jun 2017 11:53:09 +0000 Subject: [PATCH] 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 --- ietf/submit/checkers.py | 9 +-------- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/ietf/submit/checkers.py b/ietf/submit/checkers.py index ac76a65b7..9018341e2 100644 --- a/ietf/submit/checkers.py +++ b/ietf/submit/checkers.py @@ -157,12 +157,7 @@ class DraftYangChecker(object): sys.stdout = saved_stdout sys.stderr = saved_stderr # signature change in xym: - if xym.__version__.startswith('0.3'): - 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__) + model_list = extractor.get_extracted_models(False) except Exception as exc: msg = "Exception when running xym on %s: %s" % (name, exc) log(msg) @@ -174,7 +169,6 @@ class DraftYangChecker(object): for m in model_list: if not re.search(model_name_re, m): - debug.debug = True code += 1 err += "Error: Bad extracted model name: '%s'\n" % m @@ -268,7 +262,6 @@ class DraftYangChecker(object): "items": items, }) - shutil.rmtree(workdir) passed = all( res["passed"] for res in results ) diff --git a/requirements.txt b/requirements.txt index 8fc4b2a68..39ad7f241 100644 --- a/requirements.txt +++ b/requirements.txt @@ -51,6 +51,6 @@ Trac>=1.0.10,<1.2 Unidecode>=0.4.18 #wsgiref>=0.1.2 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