Better test organization

Author: tmorrell

caltechdata_api/__init__.py

@@ -1,6 +1,5 @@
-from .caltechdata_edit import (caltechdata_add, caltechdata_edit,
-                               caltechdata_unembargo)
 from .caltechdata_write import caltechdata_write, send_s3
+from .caltechdata_edit import caltechdata_add, caltechdata_edit, caltechdata_unembargo
 from .customize_schema import customize_schema
 from .decustomize_schema import decustomize_schema
 from .get_metadata import get_metadata

caltechdata_api/customize_schema.py

@@ -82,7 +82,7 @@ def customize_schema_43(json_record):
     # Extract identifiers and label as DOI or alternativeIdentifiers
     if "identifiers" in json_record:
         alt = []
-        for identifier = json_record["identifiers"]:
+        for identifier in json_record["identifiers"]:
             if identifier['identifierType'] == 'DOI':
                 json_record["doi"] = identifier
             else:
@@ -153,7 +153,7 @@ def customize_schema_43(json_record):
         json_record["contributors"] = newc
 
 
-def customize_standard(json_record)
+def customize_standard(json_record):
 
     # Extract subjects to single string
     if "subjects" in json_record:

caltechdata_api/decustomize_schema.py

@@ -214,7 +214,7 @@ def decustomize_schema_43(json_record, pass_emails, pass_media, pass_owner):
     identifiers.append({
         "alternateIdentifier": json_record["pid_value"],
         "alternateIdentifierType": "CaltechDATA_Identifier",
-    }
+    })
     if "alternateIdentifiers" in json_record:
         for altid in json_record["alternateIdentifiers"]:
             if altid["alternateIdentifierType"] != "CaltechDATA_Identifier":

run-tests.sh

@@ -1,3 +1,2 @@
 pydocstyle datacite && \
-isort -rc -c -df **/*.py && \
 pytest tests