From 9793f28ba435ede9fb7cedf6220b50fa1d7c55cb Mon Sep 17 00:00:00 2001 From: MadMan247 <54383546+MadMan247@users.noreply.github.com> Date: Tue, 7 May 2024 13:10:35 -0500 Subject: [PATCH 1/6] Update requirements.txt --- conf/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/requirements.txt b/conf/requirements.txt index 96b487f..8272222 100644 --- a/conf/requirements.txt +++ b/conf/requirements.txt @@ -1 +1 @@ -archivebox==0.6.2; +archivebox==0.7.2; From 380a5d3c5e1708d51c37b63af07833e7bf28e52d Mon Sep 17 00:00:00 2001 From: MadMan247 <54383546+MadMan247@users.noreply.github.com> Date: Tue, 7 May 2024 13:36:12 -0500 Subject: [PATCH 2/6] Update manifest.toml Removed "wisely" -- awkward word choice, not natural to read. --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index c22c9ca..908add3 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "ArchiveBox" description.en = "Archiving solution to collect, save, and view sites you want to preserve offline" description.fr = "Solution d'archivage pour collecter, enregistrer et afficher les sites que vous souhaitez conserver hors ligne" -version = "0.7.2~ynh1" +version = "0.7.2~ynh2" maintainers = ["Max Fowler"] @@ -46,7 +46,7 @@ ram.runtime = "50M" type = "user" [install.password] - help.en = "Choose wisely a password that is different from the username and does not contain the `$` symbol." + help.en = "Choose a password that is different from the username and does not contain the `$` symbol." help.fr = "Choisissez judicieusement un mot de passe différent du nom d'utilisateur et ne contenant pas le symbole `$`." type = "password" From f6d30e9f176db9d66c26c14dd92406fceb568104 Mon Sep 17 00:00:00 2001 From: MadMan247 <54383546+MadMan247@users.noreply.github.com> Date: Fri, 10 May 2024 15:21:04 -0500 Subject: [PATCH 3/6] Update notes-on-updating-archivebox-ynh.md now matches modern practices, as the package and package-lock files are no longer a part of this package. --- doc/notes-on-updating-archivebox-ynh.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/doc/notes-on-updating-archivebox-ynh.md b/doc/notes-on-updating-archivebox-ynh.md index b49b8a8..0528708 100644 --- a/doc/notes-on-updating-archivebox-ynh.md +++ b/doc/notes-on-updating-archivebox-ynh.md @@ -1,12 +1,12 @@ -this is documentation for developers working on archivebox_ynh package (or myself in the future), -for how to keep this package up to date with the upstream archivebox package on github -as it is updated. +This is intended to be documentation for developers working on the archivebox_ynh package -## 1. apt-get dependencies +## 1. Modify the Manifest.toml +Replace the following fields: +replace "version" +(under "resources.sources.main") replace "url", "sha256" -Look at Dockerfile in https://github.com/ArchiveBox/ArchiveBox to determine which dependencies -need to be specified in scripts/_common.sh -## 2. node dependencies -Copy package.json and package-lock.json from https://github.com/ArchiveBox/ArchiveBox to -conf/package.json and conf/package-lock.json respectively. \ No newline at end of file + +## 2. Modify conf/requirements.txt +requirements.txt contains a single line, which correlates to the archivebox upstream pip install script; +e.g. in requirements.txt `archivebox==0.7.2;` `from pip install --upgrade 'archivebox==0.7.2'` From 5a961ded58b62c4d26fcef551609d26ee21f2a54 Mon Sep 17 00:00:00 2001 From: MadMan247 <54383546+MadMan247@users.noreply.github.com> Date: Fri, 10 May 2024 15:21:32 -0500 Subject: [PATCH 4/6] I make the mistake --- doc/notes-on-updating-archivebox-ynh.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/notes-on-updating-archivebox-ynh.md b/doc/notes-on-updating-archivebox-ynh.md index 0528708..19b13c2 100644 --- a/doc/notes-on-updating-archivebox-ynh.md +++ b/doc/notes-on-updating-archivebox-ynh.md @@ -9,4 +9,4 @@ replace "version" ## 2. Modify conf/requirements.txt requirements.txt contains a single line, which correlates to the archivebox upstream pip install script; -e.g. in requirements.txt `archivebox==0.7.2;` `from pip install --upgrade 'archivebox==0.7.2'` +e.g. in requirements.txt `archivebox==0.7.2;` from `pip install --upgrade 'archivebox==0.7.2'` From 836613d2567be1185966bee1b1f170696968546f Mon Sep 17 00:00:00 2001 From: MadMan247 <54383546+MadMan247@users.noreply.github.com> Date: Mon, 13 May 2024 12:16:32 -0500 Subject: [PATCH 5/6] test --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 908add3..0dcc303 100644 --- a/manifest.toml +++ b/manifest.toml @@ -39,7 +39,7 @@ ram.runtime = "50M" ask.en = "Choose the application language" ask.fr = "Choisissez la langue de l'application" type = "string" - choices = ["fr", "en"] + select = ["fr", "en"] default = "fr" [install.admin] From dc061c44271c2d2f58961bdbbb1b062614c91f3c Mon Sep 17 00:00:00 2001 From: MadMan247 <54383546+MadMan247@users.noreply.github.com> Date: Thu, 16 May 2024 13:15:10 -0500 Subject: [PATCH 6/6] revert "test" Honestly, I didn't even mean to commit that last one. Also I am not really that sure what I am doing here. I expected select to have a similar function, but alas it does not. --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 0dcc303..908add3 100644 --- a/manifest.toml +++ b/manifest.toml @@ -39,7 +39,7 @@ ram.runtime = "50M" ask.en = "Choose the application language" ask.fr = "Choisissez la langue de l'application" type = "string" - select = ["fr", "en"] + choices = ["fr", "en"] default = "fr" [install.admin]