From 2b7dffe59d08b83bd8d3e390d72fb1bb2d5f48f7 Mon Sep 17 00:00:00 2001 From: Ali Zaidi <41302741+azaidi06@users.noreply.github.com> Date: Fri, 22 Nov 2024 14:50:52 -0500 Subject: [PATCH 1/6] changed macosx tutorial to properly handle different mac arch possibilities with single command --- docs/tutorials/getting_started/mac_osx.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/tutorials/getting_started/mac_osx.rst b/docs/tutorials/getting_started/mac_osx.rst index 0b2d64b185..c8472f5f47 100644 --- a/docs/tutorials/getting_started/mac_osx.rst +++ b/docs/tutorials/getting_started/mac_osx.rst @@ -35,8 +35,8 @@ Install Prerequisites ^^^^^^^^^^^^^^^^^^^^^ **Install Miniforge** -1. Download `Miniforge `_ -2. Open a terminal window & run the downloaded script. +1. curl -L -O "https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-$(uname)-$(uname -m).sh" +2. bash Miniforge3-$(uname)-$(uname -m).sh` Install IDAES-PSE From f658fc2eddfb8719444df0e4750b74aa97b90f32 Mon Sep 17 00:00:00 2001 From: Ali Zaidi <41302741+azaidi06@users.noreply.github.com> Date: Thu, 6 Feb 2025 11:42:34 -0800 Subject: [PATCH 2/6] Update mac_osx.rst Improve rendering with code-block --- docs/tutorials/getting_started/mac_osx.rst | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/tutorials/getting_started/mac_osx.rst b/docs/tutorials/getting_started/mac_osx.rst index c8472f5f47..5f0a334094 100644 --- a/docs/tutorials/getting_started/mac_osx.rst +++ b/docs/tutorials/getting_started/mac_osx.rst @@ -35,8 +35,9 @@ Install Prerequisites ^^^^^^^^^^^^^^^^^^^^^ **Install Miniforge** -1. curl -L -O "https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-$(uname)-$(uname -m).sh" -2. bash Miniforge3-$(uname)-$(uname -m).sh` +.. code-block:: console + 1. curl -L -O "https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-$(uname)-$(uname -m).sh" + 2. bash Miniforge3-$(uname)-$(uname -m).sh` Install IDAES-PSE @@ -58,4 +59,4 @@ Install IDAES Examples Run IDAES Tests ^^^^^^^^^^^^^^^ -.. include:: install_templates/run_tests.txt \ No newline at end of file +.. include:: install_templates/run_tests.txt From 2f48a02aa85aff54ea8bee90c9edf3a12f5f94e9 Mon Sep 17 00:00:00 2001 From: Ali Zaidi <41302741+azaidi06@users.noreply.github.com> Date: Wed, 12 Feb 2025 16:33:30 -0500 Subject: [PATCH 3/6] Update mac_osx.rst Added newline before the code-block directive to rectify rendering issue --- docs/tutorials/getting_started/mac_osx.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/tutorials/getting_started/mac_osx.rst b/docs/tutorials/getting_started/mac_osx.rst index 5f0a334094..306f781f49 100644 --- a/docs/tutorials/getting_started/mac_osx.rst +++ b/docs/tutorials/getting_started/mac_osx.rst @@ -35,6 +35,7 @@ Install Prerequisites ^^^^^^^^^^^^^^^^^^^^^ **Install Miniforge** + .. code-block:: console 1. curl -L -O "https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-$(uname)-$(uname -m).sh" 2. bash Miniforge3-$(uname)-$(uname -m).sh` From 7b5e206aa5f69777c4b341938973269503e3a49f Mon Sep 17 00:00:00 2001 From: Ali Zaidi <41302741+azaidi06@users.noreply.github.com> Date: Wed, 12 Feb 2025 16:39:02 -0500 Subject: [PATCH 4/6] Update mac_osx.rst removed extraneous backtick in the changed command to help with rendering --- docs/tutorials/getting_started/mac_osx.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tutorials/getting_started/mac_osx.rst b/docs/tutorials/getting_started/mac_osx.rst index 306f781f49..35b0d24b13 100644 --- a/docs/tutorials/getting_started/mac_osx.rst +++ b/docs/tutorials/getting_started/mac_osx.rst @@ -38,7 +38,7 @@ Install Prerequisites .. code-block:: console 1. curl -L -O "https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-$(uname)-$(uname -m).sh" - 2. bash Miniforge3-$(uname)-$(uname -m).sh` + 2. bash Miniforge3-$(uname)-$(uname -m).sh Install IDAES-PSE From fd2dbcb4281cc9aa2b9dd9bff9f4e80b85d9ea07 Mon Sep 17 00:00:00 2001 From: Ali Zaidi <41302741+azaidi06@users.noreply.github.com> Date: Wed, 12 Feb 2025 16:54:17 -0500 Subject: [PATCH 5/6] Update mac_osx.rst adding newline after code-block directive to render correctly --- docs/tutorials/getting_started/mac_osx.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/tutorials/getting_started/mac_osx.rst b/docs/tutorials/getting_started/mac_osx.rst index 35b0d24b13..9f6c552a8c 100644 --- a/docs/tutorials/getting_started/mac_osx.rst +++ b/docs/tutorials/getting_started/mac_osx.rst @@ -37,6 +37,7 @@ Install Prerequisites **Install Miniforge** .. code-block:: console + 1. curl -L -O "https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-$(uname)-$(uname -m).sh" 2. bash Miniforge3-$(uname)-$(uname -m).sh From e199787649528f3908aa4999343ec883efb04874 Mon Sep 17 00:00:00 2001 From: Ali Zaidi <41302741+azaidi06@users.noreply.github.com> Date: Thu, 13 Feb 2025 14:15:17 -0500 Subject: [PATCH 6/6] Update docs/tutorials/getting_started/mac_osx.rst remove numbering and re-add double quotes around second command Co-authored-by: Ludovico Bianchi --- docs/tutorials/getting_started/mac_osx.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/tutorials/getting_started/mac_osx.rst b/docs/tutorials/getting_started/mac_osx.rst index 9f6c552a8c..c62202875c 100644 --- a/docs/tutorials/getting_started/mac_osx.rst +++ b/docs/tutorials/getting_started/mac_osx.rst @@ -38,8 +38,8 @@ Install Prerequisites .. code-block:: console - 1. curl -L -O "https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-$(uname)-$(uname -m).sh" - 2. bash Miniforge3-$(uname)-$(uname -m).sh + curl -L -O "https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-$(uname)-$(uname -m).sh" + bash "Miniforge3-$(uname)-$(uname -m).sh" Install IDAES-PSE