From 3ed9e4ba23b3a30abe6ba35531fabd0ccb0d33c7 Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Wed, 3 Jan 2024 05:15:22 +0100
Subject: [PATCH 01/24] Upgrade to v0.7.1

---
 manifest.toml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index fa28d52..d977709 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -5,7 +5,7 @@ name = "BookWyrm"
 description.en = "Platform for social reading"
 description.fr = "Plateforme de lecture sociale"
 
-version = "0.6.6~ynh2"
+version = "0.7.1~ynh1"
 
 maintainers = ["oufmilo"]
 
@@ -50,8 +50,8 @@ ram.runtime = "50M"
     [resources.sources]
 
         [resources.sources.main]
-        url = "https://github.com/bookwyrm-social/bookwyrm/archive/refs/tags/v0.6.6.tar.gz"
-        sha256 = "e19b802e5ebcbaeb979f174f8f7fbd23690acee9000468a48016118257df5939"
+        url = "https://github.com/bookwyrm-social/bookwyrm/archive/refs/tags/v0.7.1.tar.gz"
+        sha256 = "a5a1422bf26728b6d73c267f57946717c6d26513e48dc25687ab633a673ebf4e"
 
         autoupdate.strategy = "latest_github_tag"
 

From 147cf0de4feaaddf589301f80424b17983885092 Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Wed, 3 Jan 2024 04:15:25 +0000
Subject: [PATCH 02/24] Auto-update README

---
 README.md    | 2 +-
 README_fr.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 9d200e7..749c139 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 BookWyrm is a social network for tracking your reading, talking about books, writing reviews, and discovering what to read next.
 
 
-**Shipped version:** 0.6.6~ynh2
+**Shipped version:** 0.7.1~ynh1
 
 **Demo:** https://joinbookwyrm.com/fr/
 
diff --git a/README_fr.md b/README_fr.md
index 2f5d09a..d188675 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
 BookWyrm est un réseau social pour garder la trace de vos lectures, parler de livres, écrire des critiques et découvrir quoi lire ensuite.
 
 
-**Version incluse :** 0.6.6~ynh2
+**Version incluse :** 0.7.1~ynh1
 
 **Démo :** https://joinbookwyrm.com/fr/
 

From 3238efd603951f8802eb2a25be1afcd47b7e0d64 Mon Sep 17 00:00:00 2001
From: Thomas <51749973+Thovi98@users.noreply.github.com>
Date: Wed, 3 Jan 2024 12:21:36 +0100
Subject: [PATCH 03/24] add in_subdir = true

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

diff --git a/manifest.toml b/manifest.toml
index d977709..ad98c74 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 = "a5a1422bf26728b6d73c267f57946717c6d26513e48dc25687ab633a673ebf4e"
-
+        in_subdir = true
         autoupdate.strategy = "latest_github_tag"
 
         [resources.sources.fonts]

From b285edd004ec1e383689988f38c8be97ccca4b46 Mon Sep 17 00:00:00 2001
From: Thomas <51749973+Thovi98@users.noreply.github.com>
Date: Wed, 3 Jan 2024 13:03:57 +0100
Subject: [PATCH 04/24] try VERSION file in another dir

---
 scripts/install | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/install b/scripts/install
index 381ed38..edb1d21 100755
--- a/scripts/install
+++ b/scripts/install
@@ -21,6 +21,9 @@ ynh_script_progression --message="Setting up source files..." --weight=1
 ynh_setup_source --dest_dir="$install_dir" --source_id="main"
 ynh_setup_source --dest_dir="$install_dir/static/fonts/source_han_sans" --source_id="fonts"
 
+#temporary try 
+cp -rp $install_dir/VERSION $install_dir/bookwyrm/
+
 # Set permissions to app files
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"

From be9186574756877cdae6ab8b8a6c7e7079283ede Mon Sep 17 00:00:00 2001
From: Thomas <51749973+Thovi98@users.noreply.github.com>
Date: Wed, 3 Jan 2024 17:09:23 +0100
Subject: [PATCH 05/24] debug again

---
 scripts/install | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/install b/scripts/install
index edb1d21..f142968 100755
--- a/scripts/install
+++ b/scripts/install
@@ -24,6 +24,10 @@ ynh_setup_source --dest_dir="$install_dir/static/fonts/source_han_sans" --source
 #temporary try 
 cp -rp $install_dir/VERSION $install_dir/bookwyrm/
 
+pushd $install_dir
+ynh_exec_warn_less wget https://ci-apps-bookworm-dev.yunohost.org/ci/logs/198.log
+popd
+
 # Set permissions to app files
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"

From 91ed391f7f638f9ea812a4d5d91dabc682b1b8d3 Mon Sep 17 00:00:00 2001
From: Thomas <51749973+Thovi98@users.noreply.github.com>
Date: Thu, 4 Jan 2024 08:24:26 +0100
Subject: [PATCH 06/24] disable changes

---
 scripts/install | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/install b/scripts/install
index f142968..bee052d 100755
--- a/scripts/install
+++ b/scripts/install
@@ -22,11 +22,11 @@ ynh_setup_source --dest_dir="$install_dir" --source_id="main"
 ynh_setup_source --dest_dir="$install_dir/static/fonts/source_han_sans" --source_id="fonts"
 
 #temporary try 
-cp -rp $install_dir/VERSION $install_dir/bookwyrm/
+#cp -rp $install_dir/VERSION $install_dir/bookwyrm/
 
-pushd $install_dir
-ynh_exec_warn_less wget https://ci-apps-bookworm-dev.yunohost.org/ci/logs/198.log
-popd
+#pushd $install_dir
+#ynh_exec_warn_less wget https://ci-apps-bookworm-dev.yunohost.org/ci/logs/198.log
+#popd
 
 # Set permissions to app files
 chmod -R o-rwx "$install_dir"

From 9fa0be238f681d032aae48d7b81d02540312de34 Mon Sep 17 00:00:00 2001
From: Thomas <51749973+Thovi98@users.noreply.github.com>
Date: Thu, 4 Jan 2024 09:06:54 +0100
Subject: [PATCH 07/24] Update manifest.toml

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

diff --git a/manifest.toml b/manifest.toml
index ad98c74..06d765f 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -21,7 +21,7 @@ fund = ["https://patreon.com/bookwyrm", "https://opencollective.com/bookwyrm"]
 [integration]
 yunohost = ">= 11.2"
 architectures = "all"
-multi_instance = false
+multi_instance = true
 ldap = false
 sso = false
 disk = "50M"

From 82bd01a73d8020719606e575e14088c2ca61a0d0 Mon Sep 17 00:00:00 2001
From: Thomas <51749973+Thovi98@users.noreply.github.com>
Date: Thu, 4 Jan 2024 10:23:08 +0100
Subject: [PATCH 08/24] cleanup and fixes migrate command (VERSION file or
 directory not found)

---
 manifest.toml   |  2 +-
 scripts/install | 11 ++++++-----
 scripts/upgrade |  2 ++
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index 06d765f..ad98c74 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -21,7 +21,7 @@ fund = ["https://patreon.com/bookwyrm", "https://opencollective.com/bookwyrm"]
 [integration]
 yunohost = ">= 11.2"
 architectures = "all"
-multi_instance = true
+multi_instance = false
 ldap = false
 sso = false
 disk = "50M"
diff --git a/scripts/install b/scripts/install
index bee052d..f35c91b 100755
--- a/scripts/install
+++ b/scripts/install
@@ -21,12 +21,11 @@ ynh_script_progression --message="Setting up source files..." --weight=1
 ynh_setup_source --dest_dir="$install_dir" --source_id="main"
 ynh_setup_source --dest_dir="$install_dir/static/fonts/source_han_sans" --source_id="fonts"
 
-#temporary try 
-#cp -rp $install_dir/VERSION $install_dir/bookwyrm/
 
-#pushd $install_dir
-#ynh_exec_warn_less wget https://ci-apps-bookworm-dev.yunohost.org/ci/logs/198.log
-#popd
+
+
+
+
 
 # Set permissions to app files
 chmod -R o-rwx "$install_dir"
@@ -50,10 +49,12 @@ $install_dir/venv/bin/pip3 install -r "$install_dir/requirements.txt"
 #=================================================
 ynh_script_progression --message="Initializing database..." --weight=1
 
+pushd $install_dir
 $install_dir/venv/bin/python3 "$install_dir/manage.py" migrate
 $install_dir/venv/bin/python3 "$install_dir/manage.py" initdb
 $install_dir/venv/bin/python3 "$install_dir/manage.py" compile_themes
 $install_dir/venv/bin/python3 "$install_dir/manage.py" collectstatic --no-input
+popd
 
 #=================================================
 # NGINX CONFIGURATION
diff --git a/scripts/upgrade b/scripts/upgrade
index 660b18c..f12c2e5 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -77,11 +77,13 @@ $install_dir/venv/bin/pip3 install -r "$install_dir/requirements.txt"
 #=================================================
 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" makemigrations --merge --noinput
 $install_dir/venv/bin/python3 "$install_dir/manage.py" migrate
+popd
 
 #=================================================
 # SET PERMISSIONS ON BOOKWYRM DIRECTORY

From ae5f532f55e6d6657084975607275da1e6ca7551 Mon Sep 17 00:00:00 2001
From: Thomas <51749973+Thovi98@users.noreply.github.com>
Date: Thu, 4 Jan 2024 10:56:43 +0100
Subject: [PATCH 09/24] fix linter warning by changing --line-match

---
 scripts/install | 2 +-
 scripts/restore | 2 +-
 scripts/upgrade | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/install b/scripts/install
index f35c91b..44ea197 100755
--- a/scripts/install
+++ b/scripts/install
@@ -105,7 +105,7 @@ yunohost service add "$app-worker" --log="/var/log/$app/$app-worker.log"
 ynh_script_progression --message="Starting a systemd service..." --weight=1
 
 # Start a systemd service
-ynh_systemd_action --service_name="$app-beat" --action="start" --log_path="systemd" --line_match="Started"
+ynh_systemd_action --service_name="$app-beat" --action="start" --log_path="systemd" --line_match="Started bookwyrm celery beat process"
 ynh_systemd_action --service_name="$app-server" --action="start" --log_path="systemd" --line_match="Booting worker with pid"
 ynh_systemd_action --service_name="$app-worker" --action="start" --log_path="systemd" --line_match="ready"
 
diff --git a/scripts/restore b/scripts/restore
index 0113f4b..f354e6c 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -67,7 +67,7 @@ yunohost service add "$app-worker" --log="/var/log/$app/$app-worker.log"
 #=================================================
 ynh_script_progression --message="Starting a systemd service..." --weight=1
 
-ynh_systemd_action --service_name="$app-beat" --action="start" --log_path="systemd" --line_match="Started"
+ynh_systemd_action --service_name="$app-beat" --action="start" --log_path="systemd" --line_match="Started bookwyrm celery beat process"
 ynh_systemd_action --service_name="$app-server" --action="start" --log_path="systemd" --line_match="Booting worker with pid"
 ynh_systemd_action --service_name="$app-worker" --action="start" --log_path="systemd" --line_match="ready"
 
diff --git a/scripts/upgrade b/scripts/upgrade
index f12c2e5..3109f7c 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -127,7 +127,7 @@ yunohost service add "$app-worker" --log="/var/log/$app/$app-worker.log"
 #=================================================
 ynh_script_progression --message="Starting a systemd service..." --weight=1
 
-ynh_systemd_action --service_name="$app-beat" --action="start" --log_path="systemd" --line_match="Started"
+ynh_systemd_action --service_name="$app-beat" --action="start" --log_path="systemd" --line_match="Started bookwyrm celery beat process"
 ynh_systemd_action --service_name="$app-server" --action="start" --log_path="systemd" --line_match="Booting worker with pid"
 ynh_systemd_action --service_name="$app-worker" --action="start" --log_path="systemd" --line_match="ready"
 

From 224abd6e992743f8f09dcad44e0ebc4e615dcdaa Mon Sep 17 00:00:00 2001
From: Thomas <51749973+Thovi98@users.noreply.github.com>
Date: Thu, 4 Jan 2024 10:57:24 +0100
Subject: [PATCH 10/24] cleaning

---
 scripts/install | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/scripts/install b/scripts/install
index 44ea197..a7ea36f 100755
--- a/scripts/install
+++ b/scripts/install
@@ -21,12 +21,6 @@ ynh_script_progression --message="Setting up source files..." --weight=1
 ynh_setup_source --dest_dir="$install_dir" --source_id="main"
 ynh_setup_source --dest_dir="$install_dir/static/fonts/source_han_sans" --source_id="fonts"
 
-
-
-
-
-
-
 # Set permissions to app files
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"

From 028af0b3a06540800a70724960e7e65bc8463adc Mon Sep 17 00:00:00 2001
From: Thomas <51749973+Thovi98@users.noreply.github.com>
Date: Thu, 4 Jan 2024 10:58:36 +0100
Subject: [PATCH 11/24] add test and cleanup test names

---
 tests.toml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests.toml b/tests.toml
index 435ba2e..426efee 100644
--- a/tests.toml
+++ b/tests.toml
@@ -17,5 +17,6 @@ test_format = 1.0
     # Commits to test upgrade from
     # -------------------------------
 
-    test_upgrade_from.7600f04.name = "Upgrade from 0.5.4"
-    test_upgrade_from.d291f0e.name = "Upgrade from 0.6.4"
+    test_upgrade_from.7600f04.name = "0.5.4"
+    test_upgrade_from.d291f0e.name = "0.6.4"
+    test_upgrade_from.80ce892.name = "0.6.6"

From 979303fed2699dbc0c9f9b61f7c0b94f9b3254cc Mon Sep 17 00:00:00 2001
From: Thomas <51749973+Thovi98@users.noreply.github.com>
Date: Thu, 4 Jan 2024 11:16:26 +0100
Subject: [PATCH 12/24] Update source because of migration failure
 (https://github.com/bookwyrm-social/bookwyrm/pull/3182)

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

diff --git a/manifest.toml b/manifest.toml
index ad98c74..5e2abda 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 = "a5a1422bf26728b6d73c267f57946717c6d26513e48dc25687ab633a673ebf4e"
+        sha256 = "807170dcca7a7377f4d11691d4a86e7707816925c8a4165e0e6f9be96ad3ca79"
         in_subdir = true
         autoupdate.strategy = "latest_github_tag"
 

From a2767553349db0aaf87f4db68908748cac2aa8d5 Mon Sep 17 00:00:00 2001
From: Thomas <51749973+Thovi98@users.noreply.github.com>
Date: Thu, 4 Jan 2024 11:26:04 +0100
Subject: [PATCH 13/24] Fix source url

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

diff --git a/manifest.toml b/manifest.toml
index 5e2abda..9a691af 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -50,7 +50,7 @@ ram.runtime = "50M"
     [resources.sources]
 
         [resources.sources.main]
-        url = "https://github.com/bookwyrm-social/bookwyrm/archive/refs/tags/v0.7.1.tar.gz"
+        url = "https://github.com/bookwyrm-social/bookwyrm/archive/d637b8033f4b7369fdbd4d160b13ddb51dc190d2.tar.gz"
         sha256 = "807170dcca7a7377f4d11691d4a86e7707816925c8a4165e0e6f9be96ad3ca79"
         in_subdir = true
         autoupdate.strategy = "latest_github_tag"

From 03b5e5f9fb0875d27f41f4f271449c8cdcac3784 Mon Sep 17 00:00:00 2001
From: Thomas <51749973+Thovi98@users.noreply.github.com>
Date: Thu, 4 Jan 2024 11:27:59 +0100
Subject: [PATCH 14/24] Removed stopped --line-match

---
 scripts/upgrade | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 3109f7c..e31803a 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -32,9 +32,9 @@ upgrade_type=$(ynh_check_app_version_changed)
 #=================================================
 ynh_script_progression --message="Stopping a systemd service..." --weight=1
 
-ynh_systemd_action --action="stop" --service_name="bookwyrm-beat" --log_path="systemd" --line_match="Stopped"
-ynh_systemd_action --action="stop" --service_name="bookwyrm-server" --log_path="systemd" --line_match="Stopped"
-ynh_systemd_action --action="stop" --service_name="bookwyrm-worker" --log_path="systemd" --line_match="Stopped"
+ynh_systemd_action --action="stop" --service_name="bookwyrm-beat" --log_path="systemd"
+ynh_systemd_action --action="stop" --service_name="bookwyrm-server" --log_path="systemd"
+ynh_systemd_action --action="stop" --service_name="bookwyrm-worker" --log_path="systemd"
 
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE

From af0f9d190bd98aea2a922472c9aa51f727a84c7e Mon Sep 17 00:00:00 2001
From: Thomas <51749973+Thovi98@users.noreply.github.com>
Date: Thu, 4 Jan 2024 16:08:29 +0100
Subject: [PATCH 15/24] Update source url to prevent umstraem issue

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

diff --git a/manifest.toml b/manifest.toml
index 9a691af..83b4120 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -50,8 +50,8 @@ ram.runtime = "50M"
     [resources.sources]
 
         [resources.sources.main]
-        url = "https://github.com/bookwyrm-social/bookwyrm/archive/d637b8033f4b7369fdbd4d160b13ddb51dc190d2.tar.gz"
-        sha256 = "807170dcca7a7377f4d11691d4a86e7707816925c8a4165e0e6f9be96ad3ca79"
+        url = "https://github.com/bookwyrm-social/bookwyrm/archive/597378bb78c868a5c68667e07155b5df00b31c1d.tar.gz"
+        sha256 = "a3a0a340fa1a9f716c4debb1ec242b2a7c275f30be4612fb245cd42f44868e5f"
         in_subdir = true
         autoupdate.strategy = "latest_github_tag"
 

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 16/24] 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 17/24] 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 18/24] 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 19/24] 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 20/24] 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 21/24] 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 22/24] 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 23/24] 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"

From 3ab946f82e5dcb6871cd6b903969903b450db749 Mon Sep 17 00:00:00 2001
From: oufmilo <44617467+oufmilo@users.noreply.github.com>
Date: Fri, 5 Jan 2024 00:43:05 +0100
Subject: [PATCH 24/24] Add fund

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

diff --git a/manifest.toml b/manifest.toml
index 83b4120..ea1bd87 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"