From a07a1a8e0228d3f1a53f97fa4a696f264d1bde25 Mon Sep 17 00:00:00 2001 From: Joshua Shields <54691495+jvshields@users.noreply.github.com> Date: Fri, 16 Aug 2024 16:29:33 -0400 Subject: [PATCH] pin tardis (#206) --- .github/workflows/benchmarks.yml | 2 +- .github/workflows/build-docs.yml | 2 +- .github/workflows/tests.yml | 2 +- docs/installation.rst | 7 +++---- stardis_env3.yml | 2 +- stardis_env3_cuda.yml | 2 +- 6 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index d10d4f70..2b4c9913 100644 --- a/.github/workflows/benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -1,7 +1,7 @@ name: benchmarks env: - TARDIS_VER: master + TARDIS_VER: release-2024.08.12 # master on: push: diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml index 9a0e394e..239e4c9d 100644 --- a/.github/workflows/build-docs.yml +++ b/.github/workflows/build-docs.yml @@ -46,7 +46,7 @@ jobs: id: install-tardis # shell: bash -l {0} run: | - pip install git+https://github.com/tardis-sn/tardis.git # @release-2023.04.16 + pip install git+https://github.com/tardis-sn/tardis.git@release-2024.08.12 - name: Install STARDIS id: install-stardis diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 3625cc1a..5cbadcf7 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -65,7 +65,7 @@ jobs: id: install-tardis # shell: bash -l {0} run: | - pip install git+https://github.com/tardis-sn/tardis.git + pip install git+https://github.com/tardis-sn/tardis.git@release-2024.08.12 - name: Install STARDIS id: install-stardis diff --git a/docs/installation.rst b/docs/installation.rst index 71886ae7..7fd47b69 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -14,8 +14,7 @@ Setting Up the Environment * STARDIS packages and dependencies are distributed only through the `conda `__ package management system, therefore installation requires a conda distribution to be installed on your system. STARDIS uses `Miniconda `__ or `Mamba `__ by default. Other distributions are untested. STARDIS uses exclusively the packages in the TARDIS enviroment, as well -as using the TARDIS code itself. It uses a shared environment with TARDIS, -as well as the TARDIS code itself. We strongly suggest that users create a separate +as using the TARDIS code itself. We strongly suggest that users create a separate environment for STARDIS. To do this, run the following in the terminal (replacing ``{platform}`` with ``linux-64``, ``linux-64-cuda``, or ``osx-64`` as applicable). @@ -26,7 +25,7 @@ the following in the terminal (replacing ``{platform}`` with $ wget -q https://raw.githubusercontent.com/tardis-sn/tardis/master/conda-{platform}.lock $ conda create --name stardis --file conda-{platform}.lock $ conda activate stardis - $ pip install git+https://github.com/tardis-sn/tardis.git + $ pip install git+https://github.com/tardis-sn/tardis.git@release-2024.08.12 The third command (``conda activate stardis``) activates the environment, which is necessary to correctly install STARDIS using the directions below. @@ -39,7 +38,7 @@ If you are using Mamba, the steps are similar: $ wget -q https://raw.githubusercontent.com/tardis-sn/tardis/master/conda-{platform}.lock $ mamba create --name stardis --file conda-{platform}.lock $ mamba activate stardis - $ pip install git+https://github.com/tardis-sn/tardis.git + $ pip install git+https://github.com/tardis-sn/tardis.git@release-2024.08.12 Downloading and Installing STARDIS ---------------------------------- diff --git a/stardis_env3.yml b/stardis_env3.yml index d8b4a59a..ed126f2c 100644 --- a/stardis_env3.yml +++ b/stardis_env3.yml @@ -41,7 +41,7 @@ dependencies: - qgrid =1.3.1=pyhd8ed1ab_4 # qgrid-feedstock/issues/18 - pip: - - git+https://github.com/tardis-sn/tardis.git # @release-2023.04.16 + - git+https://github.com/tardis-sn/tardis.git@release-2024.08.12 # --- Packages not required for conda-forge recipe --- diff --git a/stardis_env3_cuda.yml b/stardis_env3_cuda.yml index 1ac86d0b..7545d79e 100644 --- a/stardis_env3_cuda.yml +++ b/stardis_env3_cuda.yml @@ -46,7 +46,7 @@ dependencies: - cupy - pip: - - git+https://github.com/tardis-sn/tardis.git # @release-2023.04.16 + - git+https://github.com/tardis-sn/tardis.git@release-2024.08.12 # --- Packages not required for conda-forge recipe ---