Page MenuHomeSoftware Heritage

D4830.id17474.diff
No OneTemporary

D4830.id17474.diff

diff --git a/swh/web/auth/apps.py b/swh/web/auth/apps.py
--- a/swh/web/auth/apps.py
+++ b/swh/web/auth/apps.py
@@ -8,4 +8,4 @@
class AuthConfig(AppConfig):
name = "swh.web.auth"
- label = "swh.web.auth"
+ label = "swh_web_auth"
diff --git a/swh/web/auth/migrations/0002_remove_stored_tokens.py b/swh/web/auth/migrations/0002_remove_stored_tokens.py
--- a/swh/web/auth/migrations/0002_remove_stored_tokens.py
+++ b/swh/web/auth/migrations/0002_remove_stored_tokens.py
@@ -16,7 +16,7 @@
class Migration(migrations.Migration):
dependencies = [
- ("swh.web.auth", "0001_initial"),
+ ("swh_web_auth", "0001_initial"),
]
operations = [migrations.RunPython(_remove_stored_encrypted_tokens)]
diff --git a/swh/web/auth/models.py b/swh/web/auth/models.py
--- a/swh/web/auth/models.py
+++ b/swh/web/auth/models.py
@@ -36,7 +36,7 @@
permissions: Set[str]
class Meta:
- app_label = "swh.web.auth"
+ app_label = "swh_web_auth"
proxy = True
def save(self, **kwargs):
@@ -91,5 +91,5 @@
offline_token = models.BinaryField()
class Meta:
- app_label = "swh.web.auth"
+ app_label = "swh_web_auth"
db_table = "oidc_user_offline_tokens"
diff --git a/swh/web/common/apps.py b/swh/web/common/apps.py
--- a/swh/web/common/apps.py
+++ b/swh/web/common/apps.py
@@ -8,4 +8,4 @@
class SwhWebCommonConfig(AppConfig):
name = "swh.web.common"
- label = "swh.web.common"
+ label = "swh_web_common"
diff --git a/swh/web/common/migrations/0001_initial.py b/swh/web/common/migrations/0001_initial.py
--- a/swh/web/common/migrations/0001_initial.py
+++ b/swh/web/common/migrations/0001_initial.py
@@ -21,7 +21,7 @@
def _populate_save_authorized_origins(apps, schema_editor):
- SaveAuthorizedOrigin = apps.get_model("swh.web.common", "SaveAuthorizedOrigin")
+ SaveAuthorizedOrigin = apps.get_model("swh_web_common", "SaveAuthorizedOrigin")
for origin_url in _authorized_origins:
SaveAuthorizedOrigin.objects.create(url=origin_url)
diff --git a/swh/web/common/migrations/0002_saveoriginrequest_visit_date.py b/swh/web/common/migrations/0002_saveoriginrequest_visit_date.py
--- a/swh/web/common/migrations/0002_saveoriginrequest_visit_date.py
+++ b/swh/web/common/migrations/0002_saveoriginrequest_visit_date.py
@@ -11,7 +11,7 @@
class Migration(migrations.Migration):
dependencies = [
- ("swh.web.common", "0001_initial"),
+ ("swh_web_common", "0001_initial"),
]
operations = [
diff --git a/swh/web/common/migrations/0003_saveoriginrequest_loading_task_status.py b/swh/web/common/migrations/0003_saveoriginrequest_loading_task_status.py
--- a/swh/web/common/migrations/0003_saveoriginrequest_loading_task_status.py
+++ b/swh/web/common/migrations/0003_saveoriginrequest_loading_task_status.py
@@ -18,7 +18,7 @@
So remove the rows associated to already archived tasks as
the loading status can not be retrieved anymore.
"""
- SaveOriginRequest = apps.get_model("swh.web.common", "SaveOriginRequest")
+ SaveOriginRequest = apps.get_model("swh_web_common", "SaveOriginRequest")
no_saved_status_tasks = []
for sor in SaveOriginRequest.objects.all():
tasks = scheduler().get_tasks([sor.loading_task_id])
@@ -30,7 +30,7 @@
class Migration(migrations.Migration):
dependencies = [
- ("swh.web.common", "0002_saveoriginrequest_visit_date"),
+ ("swh_web_common", "0002_saveoriginrequest_visit_date"),
]
operations = [
diff --git a/swh/web/common/migrations/0004_auto_20190204_1324.py b/swh/web/common/migrations/0004_auto_20190204_1324.py
--- a/swh/web/common/migrations/0004_auto_20190204_1324.py
+++ b/swh/web/common/migrations/0004_auto_20190204_1324.py
@@ -11,7 +11,7 @@
class Migration(migrations.Migration):
dependencies = [
- ("swh.web.common", "0003_saveoriginrequest_loading_task_status"),
+ ("swh_web_common", "0003_saveoriginrequest_loading_task_status"),
]
operations = [
diff --git a/swh/web/common/migrations/0005_remove_duplicated_authorized_origins.py b/swh/web/common/migrations/0005_remove_duplicated_authorized_origins.py
--- a/swh/web/common/migrations/0005_remove_duplicated_authorized_origins.py
+++ b/swh/web/common/migrations/0005_remove_duplicated_authorized_origins.py
@@ -19,7 +19,7 @@
class Migration(migrations.Migration):
dependencies = [
- ("swh.web.common", "0004_auto_20190204_1324"),
+ ("swh_web_common", "0004_auto_20190204_1324"),
]
operations = [migrations.RunPython(_remove_duplicated_urls_in_authorized_list)]
diff --git a/swh/web/common/migrations/0006_rename_origin_type.py b/swh/web/common/migrations/0006_rename_origin_type.py
--- a/swh/web/common/migrations/0006_rename_origin_type.py
+++ b/swh/web/common/migrations/0006_rename_origin_type.py
@@ -11,7 +11,7 @@
class Migration(migrations.Migration):
dependencies = [
- ("swh.web.common", "0005_remove_duplicated_authorized_origins"),
+ ("swh_web_common", "0005_remove_duplicated_authorized_origins"),
]
operations = [
diff --git a/swh/web/common/migrations/0007_save_request_task_status_fix_typo.py b/swh/web/common/migrations/0007_save_request_task_status_fix_typo.py
--- a/swh/web/common/migrations/0007_save_request_task_status_fix_typo.py
+++ b/swh/web/common/migrations/0007_save_request_task_status_fix_typo.py
@@ -10,7 +10,7 @@
"""
Fix a typo in save request status value.
"""
- SaveOriginRequest = apps.get_model("swh.web.common", "SaveOriginRequest")
+ SaveOriginRequest = apps.get_model("swh_web_common", "SaveOriginRequest")
for sor in SaveOriginRequest.objects.all():
if sor.loading_task_status == "succeed":
sor.loading_task_status = "succeeded"
@@ -20,7 +20,7 @@
class Migration(migrations.Migration):
dependencies = [
- ("swh.web.common", "0006_rename_origin_type"),
+ ("swh_web_common", "0006_rename_origin_type"),
]
operations = [
diff --git a/swh/web/common/migrations/0008_save-code-now_indexes_20210106_1327.py b/swh/web/common/migrations/0008_save-code-now_indexes_20210106_1327.py
--- a/swh/web/common/migrations/0008_save-code-now_indexes_20210106_1327.py
+++ b/swh/web/common/migrations/0008_save-code-now_indexes_20210106_1327.py
@@ -8,7 +8,7 @@
class Migration(migrations.Migration):
dependencies = [
- ("swh.web.common", "0007_save_request_task_status_fix_typo"),
+ ("swh_web_common", "0007_save_request_task_status_fix_typo"),
]
operations = [
diff --git a/swh/web/common/models.py b/swh/web/common/models.py
--- a/swh/web/common/models.py
+++ b/swh/web/common/models.py
@@ -14,7 +14,7 @@
url = models.CharField(max_length=200, null=False)
class Meta:
- app_label = "swh.web.common"
+ app_label = "swh_web_common"
db_table = "save_authorized_origin"
indexes = [models.Index(fields=["url"])]
@@ -31,7 +31,7 @@
url = models.CharField(max_length=200, null=False)
class Meta:
- app_label = "swh.web.common"
+ app_label = "swh_web_common"
db_table = "save_unauthorized_origin"
indexes = [models.Index(fields=["url"])]
@@ -83,7 +83,7 @@
)
class Meta:
- app_label = "swh.web.common"
+ app_label = "swh_web_common"
db_table = "save_origin_request"
ordering = ["-id"]
indexes = [models.Index(fields=["origin_url", "status"])]

File Metadata

Mime Type
text/plain
Expires
Wed, Jul 2, 10:55 AM (1 w, 5 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3217991

Event Timeline