Merge branch 'main' into add_vald_linelist_alpha_calculation

tardis-sn · Oct 30, 2023 · 43af5a2 · 43af5a2
2 parents 63e7dfc + febe678
commit 43af5a2
Show file tree

Hide file tree

Showing 5 changed files with 118 additions and 120 deletions.
diff --git a/conda-linux-64-cuda.lock b/conda-linux-64-cuda.lock
@@ -327,4 +327,4 @@ https://conda.anaconda.org/conda-forge/noarch/sphinx_rtd_theme-1.3.0-pyha770c72_
 https://conda.anaconda.org/conda-forge/noarch/sphinxcontrib-qthelp-1.0.6-pyhd8ed1ab_0.conda#cf5c9649272c677a964a7313279e3a9b
 https://conda.anaconda.org/conda-forge/noarch/sphinx-7.2.6-pyhd8ed1ab_0.conda#bbfd1120d1824d2d073bc65935f0e4c0
 https://conda.anaconda.org/conda-forge/noarch/sphinxcontrib-serializinghtml-1.1.9-pyhd8ed1ab_0.conda#0612e497d7860728f2cda421ea2aec09
-# pip tardis @ git+https://github.com/tardis-sn/tardis@cfce38d0d8945fea0f8ebcde8e22639ec8e71872
+# pip tardis @ git+https://github.com/tardis-sn/tardis@cfce38d0d8945fea0f8ebcde8e22639ec8e71872
diff --git a/conda-linux-64.lock b/conda-linux-64.lock
@@ -323,4 +323,4 @@ https://conda.anaconda.org/conda-forge/noarch/sphinx_rtd_theme-1.3.0-pyha770c72_
 https://conda.anaconda.org/conda-forge/noarch/sphinxcontrib-qthelp-1.0.6-pyhd8ed1ab_0.conda#cf5c9649272c677a964a7313279e3a9b
 https://conda.anaconda.org/conda-forge/noarch/sphinx-7.2.6-pyhd8ed1ab_0.conda#bbfd1120d1824d2d073bc65935f0e4c0
 https://conda.anaconda.org/conda-forge/noarch/sphinxcontrib-serializinghtml-1.1.9-pyhd8ed1ab_0.conda#0612e497d7860728f2cda421ea2aec09
-# pip tardis @ git+https://github.com/tardis-sn/tardis@cfce38d0d8945fea0f8ebcde8e22639ec8e71872
+# pip tardis @ git+https://github.com/tardis-sn/tardis@cfce38d0d8945fea0f8ebcde8e22639ec8e71872
diff --git a/conda-lock-cuda.yml b/conda-lock-cuda.yml
@@ -4658,4 +4658,4 @@ package:
   source:
     type: url
     url: git+https://github.com/tardis-sn/tardis@cfce38d0d8945fea0f8ebcde8e22639ec8e71872
-  optional: false
+  optional: false
diff --git a/conda-lock.yml b/conda-lock.yml
@@ -8869,4 +8869,4 @@ package:
   source:
     type: url
     url: git+https://github.com/tardis-sn/tardis@cfce38d0d8945fea0f8ebcde8e22639ec8e71872
-  optional: false
+  optional: false