From 46035b9f391fd72769a7f9e99ca0b4132995b68f Mon Sep 17 00:00:00 2001
From: Petitminion <petitminion@riseup.net>
Date: Sun, 9 Mar 2025 17:29:37 +0100
Subject: [PATCH] Revert "fix(db):fix the fix of migrations regression from
 library drop NOCHANGELOG"

This reverts commit 801ffbce40b900a9e79c0b5b3572b7dfba81ddde.
---
 ...artist_remove_track_artist_artistcredit_and_more.py |  1 +
 .../music/migrations/0060_empty_for_test.py            | 10 ----------
 ...aylist.py => 0060_migrate_libraries_to_playlist.py} |  2 +-
 ..._lib_description.py => 0061_del_lib_description.py} |  2 +-
 ...provider.py => 0062_upload_third_party_provider.py} |  2 +-
 api/tests/music/test_migrations.py                     |  4 ++--
 6 files changed, 6 insertions(+), 15 deletions(-)
 delete mode 100644 api/funkwhale_api/music/migrations/0060_empty_for_test.py
 rename api/funkwhale_api/music/migrations/{0061_migrate_libraries_to_playlist.py => 0060_migrate_libraries_to_playlist.py} (97%)
 rename api/funkwhale_api/music/migrations/{0062_del_lib_description.py => 0061_del_lib_description.py} (85%)
 rename api/funkwhale_api/music/migrations/{0063_upload_third_party_provider.py => 0062_upload_third_party_provider.py} (96%)

diff --git a/api/funkwhale_api/music/migrations/0059_remove_album_artist_remove_track_artist_artistcredit_and_more.py b/api/funkwhale_api/music/migrations/0059_remove_album_artist_remove_track_artist_artistcredit_and_more.py
index 7caaf58b0..480730d90 100644
--- a/api/funkwhale_api/music/migrations/0059_remove_album_artist_remove_track_artist_artistcredit_and_more.py
+++ b/api/funkwhale_api/music/migrations/0059_remove_album_artist_remove_track_artist_artistcredit_and_more.py
@@ -36,6 +36,7 @@ def set_all_artists_credit(apps, schema_editor):
 class Migration(migrations.Migration):
     dependencies = [
         ("music", "0058_upload_quality"),
+        ("playlists", "0007_alter_playlist_actor_alter_playlisttrack_uuid_and_more"),
     ]
 
     operations = [
diff --git a/api/funkwhale_api/music/migrations/0060_empty_for_test.py b/api/funkwhale_api/music/migrations/0060_empty_for_test.py
deleted file mode 100644
index 711444c5a..000000000
--- a/api/funkwhale_api/music/migrations/0060_empty_for_test.py
+++ /dev/null
@@ -1,10 +0,0 @@
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("music", "0059_remove_album_artist_remove_track_artist_artistcredit_and_more"),
-        ("playlists", "0007_alter_playlist_actor_alter_playlisttrack_uuid_and_more"),
-    ]
-
-    operations = []
diff --git a/api/funkwhale_api/music/migrations/0061_migrate_libraries_to_playlist.py b/api/funkwhale_api/music/migrations/0060_migrate_libraries_to_playlist.py
similarity index 97%
rename from api/funkwhale_api/music/migrations/0061_migrate_libraries_to_playlist.py
rename to api/funkwhale_api/music/migrations/0060_migrate_libraries_to_playlist.py
index 5c857ddcd..7a5bb73cb 100644
--- a/api/funkwhale_api/music/migrations/0061_migrate_libraries_to_playlist.py
+++ b/api/funkwhale_api/music/migrations/0060_migrate_libraries_to_playlist.py
@@ -100,7 +100,7 @@ def migrate_libraries_to_playlist(apps, schema_editor):
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("music", "0060_empty_for_test"),
+        ("music", "0059_remove_album_artist_remove_track_artist_artistcredit_and_more"),
         ("playlists", "0008_playlist_library_drop"),
     ]
     operations = [
diff --git a/api/funkwhale_api/music/migrations/0062_del_lib_description.py b/api/funkwhale_api/music/migrations/0061_del_lib_description.py
similarity index 85%
rename from api/funkwhale_api/music/migrations/0062_del_lib_description.py
rename to api/funkwhale_api/music/migrations/0061_del_lib_description.py
index bae1ac1df..c2f8bf6a7 100644
--- a/api/funkwhale_api/music/migrations/0062_del_lib_description.py
+++ b/api/funkwhale_api/music/migrations/0061_del_lib_description.py
@@ -3,7 +3,7 @@ from django.db import migrations
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("music", "0061_migrate_libraries_to_playlist"),
+        ("music", "0060_migrate_libraries_to_playlist"),
     ]
     operations = [
         migrations.RemoveField(
diff --git a/api/funkwhale_api/music/migrations/0063_upload_third_party_provider.py b/api/funkwhale_api/music/migrations/0062_upload_third_party_provider.py
similarity index 96%
rename from api/funkwhale_api/music/migrations/0063_upload_third_party_provider.py
rename to api/funkwhale_api/music/migrations/0062_upload_third_party_provider.py
index d17b981cb..fba5c4c55 100644
--- a/api/funkwhale_api/music/migrations/0063_upload_third_party_provider.py
+++ b/api/funkwhale_api/music/migrations/0062_upload_third_party_provider.py
@@ -5,7 +5,7 @@ from django.db import migrations, models
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("music", "0062_del_lib_description"),
+        ("music", "0061_del_lib_description"),
     ]
 
     operations = [
diff --git a/api/tests/music/test_migrations.py b/api/tests/music/test_migrations.py
index ae695b527..e971055ab 100644
--- a/api/tests/music/test_migrations.py
+++ b/api/tests/music/test_migrations.py
@@ -83,9 +83,9 @@ def test_artist_credit_migration(migrator):
 def test_migrate_libraries_to_playlist(migrator):
     music_initial_migration = (
         "music",
-        "0060_empty_for_test",
+        "0059_remove_album_artist_remove_track_artist_artistcredit_and_more",
     )
-    music_final_migration = ("music", "0061_migrate_libraries_to_playlist")
+    music_final_migration = ("music", "0060_migrate_libraries_to_playlist")
 
     # Apply migrations
     migrator.migrate(