cope with datetimes when dumping JSON

Author: mr-c

Makefile

@@ -148,11 +148,11 @@ diff-cover.html: coverage.xml
 
 ## test        : run the ${MODULE} test suite
 test: $(PYSOURCES)
-	python setup.py test
+	python setup.py test ${PYTEST_EXTRA}
 
 ## testcov     : run the ${MODULE} test suite and collect coverage
 testcov: $(PYSOURCES)
-	python setup.py test --addopts "--cov"
+	python setup.py test --addopts "--cov" ${PYTEST_EXTRA}
 
 sloccount.sc: $(PYSOURCES) Makefile
 	sloccount --duplicates --wide --details $^ > $@

schema_salad/jsonld_context.py

@@ -263,10 +263,16 @@ def makerdf(
     if isinstance(wf, MutableSequence):
         for w in wf:
             w["@context"] = ctx
-            g.parse(data=json_dumps(w), format="json-ld", publicID=str(workflow))
+            g.parse(
+                data=json_dumps(w, default=str),
+                format="json-ld",
+                publicID=str(workflow),
+            )
     elif isinstance(wf, MutableMapping):
         wf["@context"] = ctx
-        g.parse(data=json_dumps(wf), format="json-ld", publicID=str(workflow))
+        g.parse(
+            data=json_dumps(wf, default=str), format="json-ld", publicID=str(workflow)
+        )
     else:
         raise SchemaException(f"{wf} is not a workflow")
 

schema_salad/main.py

@@ -265,11 +265,13 @@ def main(argsl: Optional[List[str]] = None) -> int:
 
     # Optionally print the schema after ref resolution
     if not args.document and args.print_pre:
-        json_dump(schema_doc, fp=sys.stdout, indent=4)
+        json_dump(schema_doc, fp=sys.stdout, indent=4, default=str)
         return 0
 
     if not args.document and args.print_index:
-        json_dump(list(metaschema_loader.idx.keys()), fp=sys.stdout, indent=4)
+        json_dump(
+            list(metaschema_loader.idx.keys()), fp=sys.stdout, indent=4, default=str
+        )
         return 0
 
     # Validate the schema document against the metaschema
@@ -322,21 +324,21 @@ def main(argsl: Optional[List[str]] = None) -> int:
                 exc_info=((type(err), err, None) if args.debug else None),
             )
             if args.print_avro:
-                json_dump(avsc_obj, fp=sys.stdout, indent=4)
+                json_dump(avsc_obj, fp=sys.stdout, indent=4, default=str)
             return 1
     else:
         _logger.error("Schema `%s` must be a list.", args.schema)
         return 1
 
     # Optionally print Avro-compatible schema from schema
     if args.print_avro:
-        json_dump(avsc_obj, fp=sys.stdout, indent=4)
+        json_dump(avsc_obj, fp=sys.stdout, indent=4, default=str)
         return 0
 
     # Optionally print the json-ld context from the schema
     if args.print_jsonld_context:
         j = {"@context": schema_ctx}
-        json_dump(j, fp=sys.stdout, indent=4, sort_keys=True)
+        json_dump(j, fp=sys.stdout, indent=4, sort_keys=True, default=str)
         return 0
 
     # Optionally print the RDFS graph from the schema
@@ -345,7 +347,7 @@ def main(argsl: Optional[List[str]] = None) -> int:
         return 0
 
     if args.print_metadata and not args.document:
-        json_dump(schema_metadata, fp=sys.stdout, indent=4)
+        json_dump(schema_metadata, fp=sys.stdout, indent=4, default=str)
         return 0
 
     if args.print_inheritance_dot:
@@ -379,11 +381,13 @@ def main(argsl: Optional[List[str]] = None) -> int:
 
     # Optionally print the document after ref resolution
     if args.print_pre:
-        json_dump(document, fp=sys.stdout, indent=4)
+        json_dump(document, fp=sys.stdout, indent=4, default=str)
         return 0
 
     if args.print_index:
-        json_dump(list(document_loader.idx.keys()), fp=sys.stdout, indent=4)
+        json_dump(
+            list(document_loader.idx.keys()), fp=sys.stdout, indent=4, default=str
+        )
         return 0
 
     # Validate the user document against the schema
@@ -410,7 +414,7 @@ def main(argsl: Optional[List[str]] = None) -> int:
             return 1
 
     if args.print_metadata:
-        json_dump(doc_metadata, fp=sys.stdout, indent=4)
+        json_dump(doc_metadata, fp=sys.stdout, indent=4, default=str)
         return 0
 
     print(f"Document `{args.document}` is valid")

setup.py

@@ -19,14 +19,6 @@
 needs_pytest = {"pytest", "test", "ptr"}.intersection(sys.argv)
 pytest_runner = ["pytest < 7", "pytest-runner"] if needs_pytest else []
 
-if os.path.exists("requirements.txt"):
-    requirements = [
-        r for r in open("requirements.txt").read().split("\n") if ";" not in r
-    ]
-else:
-    # In tox, it will cover them anyway.
-    requirements = []
-
 USE_MYPYC = False
 # To compile with mypyc, a mypyc checkout must be present on the PYTHONPATH
 if len(sys.argv) > 1 and sys.argv[1] == "--use-mypyc":

tox.ini

@@ -26,7 +26,8 @@ description =
   py{36,37,38,39}-lint: Lint the Python code
   py{36,37,38,39}-bandit: Search for common security issues
   py{36,37,38,39}-mypy: Check for type safety
-  py38-pydocstyle: docstring style checker
+  py39-pydocstyle: docstring style checker
+  py39-lint-readme: Lint the README.rst->.md conversion
 
 passenv =
   CI
@@ -44,7 +45,7 @@ setenv =
 
 commands =
   py{36,37,38,39}-unit: python -m pip install -U pip setuptools wheel
-  py{36,37,38,39}-unit: make coverage-report coverage.xml
+  py{36,37,38,39}-unit: make coverage-report coverage.xml PYTEST_EXTRA={posargs}
   py{36,37,38,39}-bandit: bandit --recursive --exclude schema_salad/tests/ schema_salad
   py{36,37,38,39}-lint: make flake8
   py{36,37,38,39}-lint: make format-check
@@ -64,7 +65,6 @@ deps =
     diff-cover
 
 [testenv:py39-lint-readme]
-description = Lint the README.rst->.md conversion
 commands =
   python setup.py sdist
   python setup.py bdist_wheel