rebase merge conflicts

harvester/__init__.py

@@ -21,14 +21,6 @@
 
 from .compare import compare
 from .extract import download_waf, extract, traverse_waf
-from .load import (
-    create_ckan_package,
-    dcatus_to_ckan,
-    load,
-    patch_ckan_package,
-    purge_ckan_package,
-    update_ckan_package,
-)
 
 # TODO these imports will need to be updated to ensure a consistent api
 from .harvest import *

tests/integration/load/ckan/test_ckan_cud_int.py

@@ -1,5 +1,9 @@
-from harvester.load import (create_ckan_package, patch_ckan_package,
-                            purge_ckan_package, update_ckan_package)
+from harvester.load import (
+    create_ckan_package,
+    patch_ckan_package,
+    purge_ckan_package,
+    update_ckan_package,
+)
 
 
 def test_create_package(ckan_entrypoint, test_ckan_package):

tests/unit/load/ckan/test_ckan_transform.py

@@ -1,9 +1,10 @@
+from deepdiff import DeepDiff
+
 from harvester.load import (
-    simple_transform,
     create_ckan_publisher_hierarchy,
     dcatus_to_ckan,
+    simple_transform,
 )
-from deepdiff import DeepDiff
 
 
 def test_simple_transform(test_ckan_transform_catalog):