diff --git a/arkindex/dataimport/git.py b/arkindex/dataimport/git.py index f48a2649678f93710b8078adee8deae6719f4954..887428c83fa5a70e9f5b288b3117a453a8d91637 100644 --- a/arkindex/dataimport/git.py +++ b/arkindex/dataimport/git.py @@ -51,7 +51,6 @@ class GitFlow(object): 'Invalid working directory {}'.format(working_directory) self.base_dir = working_directory self.repo_dir = os.path.join(working_directory, 'repo') - self.img_dir = os.path.join(working_directory, 'git_images') def run(self): ''' diff --git a/arkindex/documents/models.py b/arkindex/documents/models.py index 17153704858beadb4bd8566b94ada7b4d19fbd65..f209a30d07693c360f5cb346bf28a9880381d87c 100644 --- a/arkindex/documents/models.py +++ b/arkindex/documents/models.py @@ -17,9 +17,6 @@ import itertools logger = logging.getLogger(__name__) -# Language used for display -DEFAULT_LANGUAGE = 'en' - class Right(Enum): Read = 'read' diff --git a/arkindex/documents/surface.py b/arkindex/documents/surface.py index 98492a96bc3ef4e36e17a7ad71a6da58575f356a..91c7d4811e799f03f6929513ad7545ffe2f97386 100644 --- a/arkindex/documents/surface.py +++ b/arkindex/documents/surface.py @@ -7,10 +7,7 @@ import logging logger = logging.getLogger(__name__) -REGEX_VOLUME_NAME = re.compile(r'(?:JJ)?([0-9]+)([A-Z]?)') -REGEX_ACT_NUMBER = re.compile(r'([0-9]+)\s*([a-z]*)') REGEX_FOLIO = re.compile(r'(?:fol\.?\s*)?([0-9]+)\s*(bis)?\s*(r|v)?', re.IGNORECASE) -REGEX_FOLIO_GROUP = re.compile(r'([^-_à ]+)', re.IGNORECASE) class SurfaceImporter(object): diff --git a/arkindex/documents/tasks.py b/arkindex/documents/tasks.py index 22bd754edfa71329f012f58cc6173124fffb18c4..a0913187074898f56e79beced7520cefeb819fa1 100644 --- a/arkindex/documents/tasks.py +++ b/arkindex/documents/tasks.py @@ -24,15 +24,6 @@ def import_manifest(*args, **kwargs): return volume.id -def import_annotations(path, volume_id, source_id, mask=IndexImporter.DEFAULT_MASK): - """ - Import annotations from .idx.gz files into a volume - """ - volume = Element.objects.get(id=volume_id, type=ElementType.Volume) - source = DataSource.objects.get(id=source_id, type=MLToolType.Recognizer) - IndexImporter(path, volume, source, mask=mask).run() - - def import_annotations_csv(name, raw_path, source, datasource_id, index_root): """ Import annotations from a CSV line diff --git a/arkindex/documents/tests/commands/test_reindex.py b/arkindex/documents/tests/commands/test_reindex.py index 878aa7443354cc085d78ead0626abd0f1f041e92..c715bbe2fb88fa314b5d2b27529bdba7c6752049 100644 --- a/arkindex/documents/tests/commands/test_reindex.py +++ b/arkindex/documents/tests/commands/test_reindex.py @@ -16,7 +16,6 @@ class TestReindexCommand(FixtureTestCase): def setUp(self): super().setUp() self.indexer_mock = self.indexer_patch.start() - self.maxDiff = None def tearDown(self): super().tearDown() diff --git a/arkindex/documents/tests/test_pagexml.py b/arkindex/documents/tests/test_pagexml.py index 6a4cf13c1fa544df976a44dba1b15e76abe6eeec..fbc151fe49de542f154d3ed1daa3d784c8a89a4d 100644 --- a/arkindex/documents/tests/test_pagexml.py +++ b/arkindex/documents/tests/test_pagexml.py @@ -46,7 +46,6 @@ class TestPageXml(FixtureAPITestCase): content_type='application/xml', ) self.assertEqual(resp.status_code, status.HTTP_201_CREATED) - self.maxDiff = None self.assertCountEqual(self.page.transcriptions.values_list('type', 'text'), [ (TranscriptionType.Paragraph, 'B .1\nLouis Joseph\nPierre Siméon\nLemieux'), (TranscriptionType.Paragraph, 'Le onze janvier mil neuf centsept\n' diff --git a/arkindex/images/importer.py b/arkindex/images/importer.py index e0188479e7b886dc8f591266b9fd928ca2245b78..48dbd8c6420d465c73c0a73691639c51884a44d2 100644 --- a/arkindex/images/importer.py +++ b/arkindex/images/importer.py @@ -28,7 +28,7 @@ logger = logging.getLogger(__name__) TrPolygon = namedtuple('TrPolygon', 'image_id, element_id, source_id, type, polygon, text, score') -def extract_transcriptions(image, page, index_path, extension='jpg'): +def extract_transcriptions(image, page, index_path): """ Extract transcription data from index files One gzipped index file per image diff --git a/arkindex/project/tests/test_checks.py b/arkindex/project/tests/test_checks.py index 48bd5f4f233cb09308dad791cbd74e8a3b9480b9..9b7862b6302fb48cfabcb328d716188c26d155f4 100644 --- a/arkindex/project/tests/test_checks.py +++ b/arkindex/project/tests/test_checks.py @@ -306,7 +306,6 @@ class ChecksTestCase(TestCase): del settings.AWS_THUMBNAIL_BUCKET del settings.AWS_STAGING_BUCKET del settings.AWS_IIIF_BUCKET - self.maxDiff = None self.assertCountEqual(s3_check(), [ Error( 'AWS access key ID is missing; all S3-related features will fail.',