Merge barcodes

diff --git a/src/documents/tasks.py b/src/documents/tasks.py
index a007cc39781cf76a1b39428b63b0f43445042714..c2ec82b4cf424cc8f4a0a4c1223b9ea4e5f9e842 100644 (file)
--- a/src/documents/tasks.py
+++ b/src/documents/tasks.py
@@ -20,7 +20,6 @@ from filelock import FileLock
 from whoosh.writing import AsyncWriter
 
 from documents import sanity_checker
-from documents.barcodes import BarcodePlugin
 from documents.caching import clear_document_caches
 from documents.classifier import DocumentClassifier
 from documents.classifier import load_classifier
@@ -37,6 +36,7 @@ from documents.signals import document_updated
 from documents.signals.handlers import cleanup_document_deletion
 from documents.signals.handlers import run_workflows
 from paperless import index
+from paperless.barcodes import BarcodePlugin
 from paperless.consumer import ConsumerPlugin
 from paperless.consumer import WorkflowTriggerPlugin
 from paperless.data_models import ConsumableDocument

diff --git a/src/documents/tests/test_barcodes.py b/src/documents/tests/test_barcodes.py
index 70adaf7b668599285a4de20c569dd1c6305e6e90..7188d72eee96e78609169d023f45bea224ef8539 100644 (file)
--- a/src/documents/tests/test_barcodes.py
+++ b/src/documents/tests/test_barcodes.py
@@ -10,13 +10,13 @@ from django.test import TestCase
 from django.test import override_settings
 
 from documents import tasks
-from documents.barcodes import BarcodePlugin
 from documents.plugins.base import StopConsumeTaskError
 from documents.tests.utils import DirectoriesMixin
 from documents.tests.utils import DocumentConsumeDelayMixin
 from documents.tests.utils import DummyProgressManager
 from documents.tests.utils import FileSystemAssertsMixin
 from documents.tests.utils import SampleDirMixin
+from paperless.barcodes import BarcodePlugin
 from paperless.data_models import ConsumableDocument
 from paperless.data_models import DocumentMetadataOverrides
 from paperless.data_models import DocumentSource

diff --git a/src/documents/barcodes.py b/src/paperless/barcodes.py
similarity index 100%
rename from src/documents/barcodes.py
rename to src/paperless/barcodes.py