diff --git a/PKG-INFO b/PKG-INFO index 771869eaedf7b0bbaf454a1d6dc9f4ba3d63f533..6908f949d78ded36127629c65c913266c342cc47 100644 --- a/PKG-INFO +++ b/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: swh.deposit -Version: 0.0.28 +Version: 0.0.29 Summary: Software Heritage Deposit Server Home-page: https://forge.softwareheritage.org/source/swh-deposit/ Author: Software Heritage developers diff --git a/swh.deposit.egg-info/PKG-INFO b/swh.deposit.egg-info/PKG-INFO index 771869eaedf7b0bbaf454a1d6dc9f4ba3d63f533..6908f949d78ded36127629c65c913266c342cc47 100644 --- a/swh.deposit.egg-info/PKG-INFO +++ b/swh.deposit.egg-info/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: swh.deposit -Version: 0.0.28 +Version: 0.0.29 Summary: Software Heritage Deposit Server Home-page: https://forge.softwareheritage.org/source/swh-deposit/ Author: Software Heritage developers diff --git a/swh/deposit/injection/scheduler.py b/swh/deposit/injection/scheduler.py index 4e03d2074000d5eb9c574f629ab903237d721ba7..41281020b8181ba75c8d78e031d75990e685174e 100644 --- a/swh/deposit/injection/scheduler.py +++ b/swh/deposit/injection/scheduler.py @@ -125,7 +125,7 @@ class SWHSchedulerScheduling(SWHScheduling): deposit_check_url=check_url) else: task = create_oneshot_task_dict( - 'swh-deposit-archive-ingestion', + 'swh-deposit-archive-injection', archive_url=archive_url, deposit_meta_url=meta_url, deposit_update_url=update_url) diff --git a/swh/deposit/injection/tasks.py b/swh/deposit/injection/tasks.py index ce5d800a754556cf26c4fc9372c4ee1762f33ca0..b5d81d16b5d382fb243c0cad5006bc5da07aa765 100644 --- a/swh/deposit/injection/tasks.py +++ b/swh/deposit/injection/tasks.py @@ -9,11 +9,11 @@ from swh.deposit.injection.checker import DepositChecker class LoadDepositArchiveTsk(Task): - """Deposit archive ingestion task described by the following steps: + """Deposit archive injection task described by the following steps: 1. Retrieve tarball from deposit's private api and store locally in a temporary directory - 2. Trigger the ingestion + 2. Trigger the injection 3. clean up the temporary directory 4. Update the deposit's status according to result using the deposit's private update status api diff --git a/swh/deposit/signals.py b/swh/deposit/signals.py index f70ad763a5ec6a973e9e3b7599566b3cee73e46c..9863d9aa9b89ff99cd1fbcdc75115488b75ffaba 100644 --- a/swh/deposit/signals.py +++ b/swh/deposit/signals.py @@ -75,7 +75,7 @@ def post_deposit_save(sender, instance, created, raw, using, update_url = reverse(PRIVATE_PUT_DEPOSIT, args=args) task = create_oneshot_task_dict( - 'swh-deposit-archive-ingestion', + 'swh-deposit-archive-injection', archive_url=archive_url, deposit_meta_url=meta_url, deposit_update_url=update_url) diff --git a/swh/deposit/tests/api/test_deposit_update_status.py b/swh/deposit/tests/api/test_deposit_update_status.py index 909ad0add8ecdf860ab7c622c2891ab9d410f754..6532a9665ceea59d3eda657e2b20f0fa60e382ac 100644 --- a/swh/deposit/tests/api/test_deposit_update_status.py +++ b/swh/deposit/tests/api/test_deposit_update_status.py @@ -50,7 +50,7 @@ class UpdateDepositStatusTest(APITestCase, BasicTestCase): self.assertEquals(deposit.status, _status) @istest - def update_deposit_with_success_ingestion_and_swh_id(self): + def update_deposit_with_success_injection_and_swh_id(self): """Existing status for update should return a 204 response """ diff --git a/version.txt b/version.txt index 776f36836debaa29cf7a98280476a73f5b2de36f..d87fe366732cd05ccc5e4bcbb60e454638db8669 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -v0.0.28-0-gdb4fe6b \ No newline at end of file +v0.0.29-0-gca03956 \ No newline at end of file