diff --git a/debian/control b/debian/control index 19c7512..3015707 100644 --- a/debian/control +++ b/debian/control @@ -1,43 +1,42 @@ Source: swh-storage Maintainer: Software Heritage developers Section: python Priority: optional Build-Depends: debhelper (>= 9), dh-python, python3-all, python3-dateutil, python3-flask, python3-nose, python3-psycopg2, python3-requests, python3-setuptools, python3-swh.core (>= 0.0.23~), python3-swh.objstorage (>= 0.0.2~), - python3-swh.objstorage.cloud (>= 0.0.9~), python3-vcversioner, python3-swh.scheduler, python3-click Standards-Version: 3.9.6 Homepage: https://forge.softwareheritage.org/diffusion/DSTO/ Package: python3-swh.storage Architecture: all Depends: python3-swh.core (>= 0.0.23~), python3-swh.objstorage (>= 0.0.2~), ${misc:Depends}, ${python3:Depends} Description: Software Heritage storage utilities Package: python3-swh.storage.listener Architecture: all Depends: python3-swh.storage (= ${binary:Version}), ${misc:Depends}, ${python3:Depends}, python3-kafka (>= 1.3.1~) Description: Software Heritage storage listener Package: python3-swh.storage.archiver Architecture: all -Depends: python3-swh.storage (= ${binary:Version}), python3-swh.scheduler, python3-swh.objstorage.cloud (>= 0.0.9~), +Depends: python3-swh.storage (= ${binary:Version}), python3-swh.scheduler, ${misc:Depends}, ${python3:Depends} Description: Software Heritage storage Archiver Package: python3-swh.storage.provenance Architecture: all Depends: python3-swh.storage (= ${binary:Version}), python3-swh.scheduler, ${misc:Depends}, ${python3:Depends} Description: Software Heritage storage Provenance diff --git a/requirements.txt b/requirements.txt index c95b507..f2a6d32 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,17 +1,16 @@ dateutil psycopg2 vcversioner # remote storage API client requests # remote storage API server flask # Internal dependencies swh.core >= 0.0.23 swh.objstorage >= 0.0.2 -swh.objstorage.cloud >= 0.0.9 click swh.scheduler diff --git a/swh/storage/archiver/__init__.py b/swh/storage/archiver/__init__.py index 272da93..2ff1cce 100644 --- a/swh/storage/archiver/__init__.py +++ b/swh/storage/archiver/__init__.py @@ -1,13 +1,5 @@ from .director import ArchiverWithRetentionPolicyDirector # NOQA from .director import ArchiverStdinToBackendDirector # NOQA from .worker import ArchiverWithRetentionPolicyWorker # NOQA from .worker import ArchiverToBackendWorker # NOQA from .copier import ArchiverCopier # NOQA - -from swh.objstorage import register_objstorages -from swh.objstorage.cloud import AzureCloudObjStorage # noqa - -# Register new objstorage abilities -register_objstorages({ - 'azure-storage': AzureCloudObjStorage -})