From 4765c7a1002bf16caa50b03090e3d35b3984c8d0 Mon Sep 17 00:00:00 2001
From: oufmilo <44617467+oufmilo@users.noreply.github.com>
Date: Thu, 4 Jan 2024 18:02:12 +0100
Subject: [PATCH 1/8] Update v0.7.1

---
 manifest.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index 83b4120..442a2e3 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -16,7 +16,7 @@ demo = "https://joinbookwyrm.com/fr/"
 admindoc = "https://docs.joinbookwyrm.com/"
 code = "https://github.com/bookwyrm-social/bookwyrm"
 cpe = "cpe:2.3:a:joinbookwyrm:bookwyrm"
-fund = ["https://patreon.com/bookwyrm", "https://opencollective.com/bookwyrm"]
+fund = "https://patreon.com/bookwyrm", "https://opencollective.com/bookwyrm"
 
 [integration]
 yunohost = ">= 11.2"
@@ -50,7 +50,7 @@ ram.runtime = "50M"
     [resources.sources]
 
         [resources.sources.main]
-        url = "https://github.com/bookwyrm-social/bookwyrm/archive/597378bb78c868a5c68667e07155b5df00b31c1d.tar.gz"
+        url = "https://github.com/bookwyrm-social/bookwyrm/archive/refs/tags/v0.7.1.tar.gz"
         sha256 = "a3a0a340fa1a9f716c4debb1ec242b2a7c275f30be4612fb245cd42f44868e5f"
         in_subdir = true
         autoupdate.strategy = "latest_github_tag"

From afa12e66b8ec2c27533be1e7c41e818b7f0ed72c Mon Sep 17 00:00:00 2001
From: oufmilo <44617467+oufmilo@users.noreply.github.com>
Date: Thu, 4 Jan 2024 18:09:00 +0100
Subject: [PATCH 2/8] Remove in_subdir

---
 manifest.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.toml b/manifest.toml
index 442a2e3..f82dbd1 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -52,7 +52,7 @@ ram.runtime = "50M"
         [resources.sources.main]
         url = "https://github.com/bookwyrm-social/bookwyrm/archive/refs/tags/v0.7.1.tar.gz"
         sha256 = "a3a0a340fa1a9f716c4debb1ec242b2a7c275f30be4612fb245cd42f44868e5f"
-        in_subdir = true
+
         autoupdate.strategy = "latest_github_tag"
 
         [resources.sources.fonts]

From 2105950fa4a0f39855bc7fb90d05ef25e78f73bd Mon Sep 17 00:00:00 2001
From: oufmilo <44617467+oufmilo@users.noreply.github.com>
Date: Thu, 4 Jan 2024 18:10:50 +0100
Subject: [PATCH 3/8] Remove fund opencollective

---
 manifest.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.toml b/manifest.toml
index f82dbd1..a253515 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -16,7 +16,7 @@ demo = "https://joinbookwyrm.com/fr/"
 admindoc = "https://docs.joinbookwyrm.com/"
 code = "https://github.com/bookwyrm-social/bookwyrm"
 cpe = "cpe:2.3:a:joinbookwyrm:bookwyrm"
-fund = "https://patreon.com/bookwyrm", "https://opencollective.com/bookwyrm"
+fund = "https://patreon.com/bookwyrm"
 
 [integration]
 yunohost = ">= 11.2"

From b861e0aa9e26813397e16c2a7f533f03347e6040 Mon Sep 17 00:00:00 2001
From: oufmilo <44617467+oufmilo@users.noreply.github.com>
Date: Thu, 4 Jan 2024 18:17:08 +0100
Subject: [PATCH 4/8] Fix sha256

---
 manifest.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.toml b/manifest.toml
index a253515..493db14 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -51,7 +51,7 @@ ram.runtime = "50M"
 
         [resources.sources.main]
         url = "https://github.com/bookwyrm-social/bookwyrm/archive/refs/tags/v0.7.1.tar.gz"
-        sha256 = "a3a0a340fa1a9f716c4debb1ec242b2a7c275f30be4612fb245cd42f44868e5f"
+        sha256 = "a5a1422bf26728b6d73c267f57946717c6d26513e48dc25687ab633a673ebf4e"
 
         autoupdate.strategy = "latest_github_tag"
 

From a31df410618de65cbabed4769764ea33010c9594 Mon Sep 17 00:00:00 2001
From: oufmilo <44617467+oufmilo@users.noreply.github.com>
Date: Thu, 4 Jan 2024 19:14:41 +0100
Subject: [PATCH 5/8] Remove makemigrations Upgrade

---
 scripts/upgrade | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index e31803a..2cd12b3 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -81,7 +81,6 @@ pushd $install_dir
 $install_dir/venv/bin/python3 "$install_dir/manage.py" compile_themes
 $install_dir/venv/bin/python3 "$install_dir/manage.py" collectstatic --no-input
 $install_dir/venv/bin/python3 "$install_dir/manage.py" populate_streams
-$install_dir/venv/bin/python3 "$install_dir/manage.py" makemigrations --merge --noinput
 $install_dir/venv/bin/python3 "$install_dir/manage.py" migrate
 popd
 

From 24113e5732f4da1a4022bdc2b6cc2cbd61d2494d Mon Sep 17 00:00:00 2001
From: oufmilo <44617467+oufmilo@users.noreply.github.com>
Date: Thu, 4 Jan 2024 20:41:11 +0100
Subject: [PATCH 6/8] Fix upgrade version

---
 scripts/upgrade | 1 -
 tests.toml      | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 2cd12b3..ce7ec22 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -80,7 +80,6 @@ ynh_script_progression --message="Upgrading database..." --weight=1
 pushd $install_dir
 $install_dir/venv/bin/python3 "$install_dir/manage.py" compile_themes
 $install_dir/venv/bin/python3 "$install_dir/manage.py" collectstatic --no-input
-$install_dir/venv/bin/python3 "$install_dir/manage.py" populate_streams
 $install_dir/venv/bin/python3 "$install_dir/manage.py" migrate
 popd
 
diff --git a/tests.toml b/tests.toml
index 426efee..73a239c 100644
--- a/tests.toml
+++ b/tests.toml
@@ -17,6 +17,4 @@ test_format = 1.0
     # Commits to test upgrade from
     # -------------------------------
 
-    test_upgrade_from.7600f04.name = "0.5.4"
-    test_upgrade_from.d291f0e.name = "0.6.4"
-    test_upgrade_from.80ce892.name = "0.6.6"
+    test_upgrade_from.749f46f.name = "0.6.6"

From 051e5b557a0047459284b5ca7a4de3fe662a9288 Mon Sep 17 00:00:00 2001
From: oufmilo <44617467+oufmilo@users.noreply.github.com>
Date: Thu, 4 Jan 2024 21:39:10 +0100
Subject: [PATCH 7/8] Add test_upgrade

---
 tests.toml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests.toml b/tests.toml
index 73a239c..2f1968a 100644
--- a/tests.toml
+++ b/tests.toml
@@ -16,5 +16,7 @@ test_format = 1.0
     # -------------------------------
     # Commits to test upgrade from
     # -------------------------------
-
+    
+    test_upgrade_from.7600f04.name = "0.5.4"
+    test_upgrade_from.d291f0e.name = "0.6.4"
     test_upgrade_from.749f46f.name = "0.6.6"

From 882537050e2dc0ef78d3a1e862c1019c0e444249 Mon Sep 17 00:00:00 2001
From: oufmilo <44617467+oufmilo@users.noreply.github.com>
Date: Thu, 4 Jan 2024 22:34:29 +0100
Subject: [PATCH 8/8] Add fund opencollective

---
 manifest.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/manifest.toml b/manifest.toml
index 493db14..f391059 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -17,6 +17,7 @@ admindoc = "https://docs.joinbookwyrm.com/"
 code = "https://github.com/bookwyrm-social/bookwyrm"
 cpe = "cpe:2.3:a:joinbookwyrm:bookwyrm"
 fund = "https://patreon.com/bookwyrm"
+fund = "https://opencollective.com/bookwyrm"
 
 [integration]
 yunohost = ">= 11.2"