From 4ca1607df2220c078306e345259110267e4dec9f Mon Sep 17 00:00:00 2001 From: Tommaso Comparin <3862206+tcompa@users.noreply.github.com> Date: Wed, 11 Dec 2024 16:14:00 +0100 Subject: [PATCH 1/5] Update fractal-web version --- fractal-web-reference.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fractal-web-reference.txt b/fractal-web-reference.txt index b281204..dc62ae6 100644 --- a/fractal-web-reference.txt +++ b/fractal-web-reference.txt @@ -1 +1 @@ -v1.13.0 +6995a886528ff88116b2c5f6285c75db58d0882f From cc159900d365b012fe4b1c72203089d2f680b2c6 Mon Sep 17 00:00:00 2001 From: Tommaso Comparin <3862206+tcompa@users.noreply.github.com> Date: Wed, 11 Dec 2024 16:59:23 +0100 Subject: [PATCH 2/5] Update fractal-web --- fractal-web-reference.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fractal-web-reference.txt b/fractal-web-reference.txt index dc62ae6..5fe48b0 100644 --- a/fractal-web-reference.txt +++ b/fractal-web-reference.txt @@ -1 +1 @@ -6995a886528ff88116b2c5f6285c75db58d0882f +de7a085a120687aae9bda36d4e3850a8bd30e0a5 From ed59cc3142bfd108ff14ef4afeab0d9847080521 Mon Sep 17 00:00:00 2001 From: Tommaso Comparin <3862206+tcompa@users.noreply.github.com> Date: Wed, 11 Dec 2024 17:12:34 +0100 Subject: [PATCH 3/5] Improve install instructions --- tasks_data_retrieval/install_instructions.py | 27 +++++++++----------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/tasks_data_retrieval/install_instructions.py b/tasks_data_retrieval/install_instructions.py index d1e85cd..78e2b9f 100644 --- a/tasks_data_retrieval/install_instructions.py +++ b/tasks_data_retrieval/install_instructions.py @@ -1,15 +1,14 @@ -INSTALL_INSTRUCTIONS_TITLE_1 = "## How to add this task to a Fractal instance\n" -INSTALL_INSTRUCTIONS_TITLE_2 = "## How to install this task in a Python environment\n" +INSTALL_INSTRUCTIONS_TITLE_1 = "**How to add this task to a Fractal instance:**\n" +INSTALL_INSTRUCTIONS_TITLE_2 = "**How to install this task in a Python environment:**\n" def _get_default_template_pypi() -> str: lines = [ INSTALL_INSTRUCTIONS_TITLE_1, - "Trigger a _PyPI_ task collection with package `__PROJECT_NAME__` and package version `__VERSION__`.", + "Trigger a PyPI task collection with package `__PROJECT_NAME__` and package version `__VERSION__`", "", INSTALL_INSTRUCTIONS_TITLE_2, - "```", - 'pip install "__PROJECT_NAME__==__VERSION__"', + "Run `pip install \"__PROJECT_NAME__==__VERSION__\"`", "```", ] template = "\n".join(lines) + "\n" @@ -19,12 +18,10 @@ def _get_default_template_pypi() -> str: def _get_default_template_pypi_with_extra(extra: str) -> str: lines = [ INSTALL_INSTRUCTIONS_TITLE_1, - f"Trigger a _PyPI_ task collection for package `__PROJECT_NAME__`, package version `__VERSION__` and package extras {extra}.", + f"Trigger a PyPI task collection for package `__PROJECT_NAME__`, package version `__VERSION__` and package extras `{extra}`", "", INSTALL_INSTRUCTIONS_TITLE_2, - "```", - f'pip install "__PROJECT_NAME__[{extra}]==__VERSION__"', - "```", + f"Run `pip install \"__PROJECT_NAME__[{extra}]==__VERSION__\"`", ] template = "\n".join(lines) + "\n" return template @@ -33,12 +30,12 @@ def _get_default_template_pypi_with_extra(extra: str) -> str: def _get_default_template_wheel_url() -> str: lines = [ INSTALL_INSTRUCTIONS_TITLE_1, - "1. Download the wheel file from [this link](__WHEEL_URL__),", - "2. Trigger a _local_ task collection by uploading the wheel file.", + "1. Download the wheel file from [this link](__WHEEL_URL__)", + "2. Trigger a local task collection by uploading the wheel file", "", INSTALL_INSTRUCTIONS_TITLE_2, "1. Download the wheel file from [this link](__WHEEL_URL__)", - "2. `pip install __WHEEL_NAME__`", + "2. Run `pip install __WHEEL_NAME__`", ] template = "\n".join(lines) + "\n" return template @@ -47,12 +44,12 @@ def _get_default_template_wheel_url() -> str: def _get_default_template_wheel_url_with_extra(extra: str) -> str: lines = [ INSTALL_INSTRUCTIONS_TITLE_1, - "1. Download the wheel file from [this link](__WHEEL_URL__),", - f"2. Trigger a _local_ task collection by uploading the wheel file, with package extras {extra}.", + "1. Download the wheel file from [this link](__WHEEL_URL__)", + f"2. Trigger a local task collection by uploading the wheel file, with package extras `{extra}`", "", INSTALL_INSTRUCTIONS_TITLE_2, "1. Download the wheel file from [this link](__WHEEL_URL__)", - f"2. `pip install \"__WHEEL_NAME__[{extra}]\"`", + f"2. Run `pip install \"__WHEEL_NAME__[{extra}]\"`", ] template = "\n".join(lines) + "\n" return template From 829ae627a911a50ccb43136a60d4d38d3acecc50 Mon Sep 17 00:00:00 2001 From: Tommaso Comparin <3862206+tcompa@users.noreply.github.com> Date: Thu, 12 Dec 2024 18:41:26 +0100 Subject: [PATCH 4/5] Update fractal-web-reference.txt --- fractal-web-reference.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fractal-web-reference.txt b/fractal-web-reference.txt index 5fe48b0..c317a91 100644 --- a/fractal-web-reference.txt +++ b/fractal-web-reference.txt @@ -1 +1 @@ -de7a085a120687aae9bda36d4e3850a8bd30e0a5 +0.13.1 From 0dc6a288cebe8c78b0ea69b50db190fea87459e7 Mon Sep 17 00:00:00 2001 From: Tommaso Comparin <3862206+tcompa@users.noreply.github.com> Date: Thu, 12 Dec 2024 18:43:03 +0100 Subject: [PATCH 5/5] Update fractal-web-reference.txt --- fractal-web-reference.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fractal-web-reference.txt b/fractal-web-reference.txt index c317a91..8cc47ae 100644 --- a/fractal-web-reference.txt +++ b/fractal-web-reference.txt @@ -1 +1 @@ -0.13.1 +v1.13.1