|
5 | 5 | import logging
|
6 | 6 | import os
|
7 | 7 | import shutil
|
| 8 | +import subprocess # nosec |
8 | 9 | import sys
|
9 | 10 | import tempfile
|
10 | 11 | import threading
|
11 | 12 | import time
|
12 |
| -from typing import Any, Dict, List, Optional, Set, Text, Union |
13 |
| -from concurrent.futures import ThreadPoolExecutor |
14 | 13 | from collections import defaultdict
|
15 |
| -from rdflib import Graph |
| 14 | +from concurrent.futures import ThreadPoolExecutor |
| 15 | +from shlex import quote |
| 16 | +from typing import Any, Dict, List, Optional, Set, Union |
16 | 17 |
|
17 |
| -import ruamel.yaml as yaml |
| 18 | +import junit_xml |
| 19 | +import pkg_resources # part of setuptools |
18 | 20 | import ruamel.yaml.scanner as yamlscanner
|
| 21 | +import schema_salad.avro.schema |
19 | 22 | import schema_salad.ref_resolver
|
20 | 23 | import schema_salad.schema
|
21 |
| -import schema_salad.avro.schema |
22 |
| -import pkg_resources # part of setuptools |
| 24 | +from rdflib import Graph |
23 | 25 |
|
24 |
| -import junit_xml |
25 | 26 | from cwltest.utils import (
|
26 |
| - compare, |
| 27 | + REQUIRED, |
27 | 28 | CompareFail,
|
28 | 29 | TestResult,
|
29 |
| - REQUIRED, |
| 30 | + compare, |
30 | 31 | get_test_number_by_key,
|
31 | 32 | )
|
32 | 33 |
|
|
37 | 38 | UNSUPPORTED_FEATURE = 33
|
38 | 39 | DEFAULT_TIMEOUT = 600 # 10 minutes
|
39 | 40 |
|
40 |
| -import subprocess # nosec |
41 |
| -from shlex import quote |
42 |
| - |
43 | 41 | templock = threading.Lock()
|
44 | 42 |
|
45 | 43 |
|
@@ -391,8 +389,8 @@ def main(): # type: () -> int
|
391 | 389 | (
|
392 | 390 | document_loader,
|
393 | 391 | avsc_names,
|
394 |
| - schema_metadata, |
395 |
| - metaschema_loader, |
| 392 | + _, |
| 393 | + _, |
396 | 394 | ) = schema_salad.schema.load_schema(
|
397 | 395 | "https://w3id.org/cwl/cwltest/cwltest-schema.yml", cache=cache
|
398 | 396 | )
|
|
0 commit comments