From 7423095972840cc3613cdd2d3a5761472b163948 Mon Sep 17 00:00:00 2001 From: Ludovico Bianchi Date: Fri, 22 Nov 2024 10:48:55 -0600 Subject: [PATCH] Update conda install commands after idaes-pse was added to conda-forge --- .github/workflows/integration.yml | 2 +- .../getting_started/install_templates/conda_idaes_pse.txt | 2 +- docs/tutorials/getting_started/install_templates/quickstart.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 38cf60dd05..adbc7f989f 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -248,7 +248,7 @@ jobs: install-target: ${{ matrix.pip-install-target }} - name: Remove dependencies installable with pip but not with conda # NOTE some dependencies that are installed by default with pip are not available through conda - # so they're not installed if IDAES is installed with `conda -c conda-forge -c IDAES-PSE idaes-pse` + # so they're not installed if IDAES is installed with `conda -c conda-forge idaes-pse` # to ensure this scenario is handled properly, since we don't have (yet) the conda-build process integrated with the CI, # we manually remove the "pip-but-not-conda" dependencies after installing with pip # as an approximation of the enviroment that we'd get from `conda install` diff --git a/docs/tutorials/getting_started/install_templates/conda_idaes_pse.txt b/docs/tutorials/getting_started/install_templates/conda_idaes_pse.txt index 302e795c2a..920490e270 100644 --- a/docs/tutorials/getting_started/install_templates/conda_idaes_pse.txt +++ b/docs/tutorials/getting_started/install_templates/conda_idaes_pse.txt @@ -7,7 +7,7 @@ We recommend using Conda to manage your environment & modules. conda activate my-idaes-env # Install IDAES Conda package - conda install --yes -c IDAES-PSE -c conda-forge idaes-pse + conda install --yes -c conda-forge idaes-pse .. note:: The command above will install the most recent stable (release) version of IDAES. To install other versions of IDAES, including pre-release versions, diff --git a/docs/tutorials/getting_started/install_templates/quickstart.txt b/docs/tutorials/getting_started/install_templates/quickstart.txt index 51cb475815..90525a6073 100644 --- a/docs/tutorials/getting_started/install_templates/quickstart.txt +++ b/docs/tutorials/getting_started/install_templates/quickstart.txt @@ -1,5 +1,5 @@ # Set up & activate Conda new environment with IDAES-PSE -conda create --yes --name my-idaes-env -c conda-forge -c IDAES-PSE python=3.10 idaes-pse +conda create --yes --name my-idaes-env -c conda-forge python=3.10 idaes-pse conda activate my-idaes-env # Install IDAES Extensions