Merge branch 'more_mainifests' into load_modules

tests/archivers/test_archiver_base.py

@@ -1,9 +1,7 @@
 import pytest
 
-from auto_archiver.core import Metadata
-from auto_archiver.core import Step
 from auto_archiver.core.metadata import Metadata
-from auto_archiver.archivers.archiver import Archiver
+from auto_archiver.base_processors.extractor import Extractor
 class TestArchiverBase(object):
 
     archiver_class: str = None
@@ -13,7 +11,7 @@ class TestArchiverBase(object):
     def setup_archiver(self):
         assert self.archiver_class is not None, "self.archiver_class must be set on the subclass"
         assert self.config is not None, "self.config must be a dict set on the subclass"
-        self.archiver: Archiver = self.archiver_class({self.archiver_class.name: self.config})
+        self.archiver: Extractor = self.archiver_class({self.archiver_class.name: self.config})
     
     def assertValidResponseMetadata(self, test_response: Metadata, title: str, timestamp: str, status: str = ""):
         assert test_response is not False

tests/databases/test_csv_db.py

@@ -1,5 +1,5 @@
 
-from auto_archiver.databases.csv_db import CSVDb
+from auto_archiver.modules.csv_db import CSVDb
 from auto_archiver.core import Metadata
 
 

tests/enrichers/test_hash_enricher.py

@@ -1,6 +1,6 @@
 import pytest
 
-from auto_archiver.enrichers.hash_enricher import HashEnricher
+from auto_archiver.modules.hash_enricher import HashEnricher
 from auto_archiver.core import Metadata, Media
 
 @pytest.mark.parametrize("algorithm, filename, expected_hash", [

tests/formatters/test_html_formatter.py

@@ -1,5 +1,4 @@
-from auto_archiver.core.context import ArchivingContext
-from auto_archiver.formatters.html_formatter import HtmlFormatter
+from auto_archiver.modules.html_formatter import HtmlFormatter
 from auto_archiver.core import Metadata, Media