attempt to resolve conda env only once

ReactionMechanismGenerator · Jul 1, 2024 · 75b3126 · 75b3126
1 parent 67f59b3
commit 75b3126
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 14 deletions.
diff --git a/src/ReactionMechanismSimulator.jl b/src/ReactionMechanismSimulator.jl
@@ -13,15 +13,20 @@ if !("rmg" in packages) && !("rmgmolecule" in packages)
     end
     if py_version === nothing || !(v"3.7" <= py_version && py_version <= v"3.9")
         @info "python version was not in 3.7-3.9 changing python version"
-        CondaPkg.add("python"; version="3.9")
-        @info "python 3.9 installed"
+        CondaPkg.add("python"; version="3.9",resolve=false)
+        CondaPkg.add("rmgmolecule"; version=">=0.3.0", channel="mjohnson541",resolve=false)
+        CondaPkg.add("matplotlib", channel="conda-forge",resolve=false)
+        CondaPkg.add("rdkit", channel="conda-forge",resolve=false)
+        CondaPkg.add("pydot", channel="conda-forge",resolve=false)
+        CondaPkg.resolve()
+    else
+        CondaPkg.add("rmgmolecule"; version=">=0.3.0", channel="mjohnson541",resolve=false)
+        CondaPkg.add("matplotlib", channel="conda-forge",resolve=false)
+        CondaPkg.add("rdkit", channel="conda-forge",resolve=false)
+        CondaPkg.add("pydot", channel="conda-forge",resolve=false)
+        CondaPkg.resolve()
     end
-    CondaPkg.add("rmgmolecule"; version=">=0.3.0", channel="mjohnson541")
     @assert false
-    CondaPkg.add("matplotlib", channel="conda-forge")
-    CondaPkg.add("rdkit", channel="conda-forge")
-    CondaPkg.add("pydot", channel="conda-forge")
-
     Pkgc = Base.require(Base.PkgId(Base.UUID("44cfe95a-1eb2-52ea-b672-e2afdf69b78f"), "Pkg"))
     Pkgc.build("PythonCall")
 end

diff --git a/src/rmstest.jl b/src/rmstest.jl
@@ -14,15 +14,20 @@ if !("rmg" in packages) && !("rmgmolecule" in packages)
     end
     if py_version === nothing || !(v"3.7" <= py_version && py_version <= v"3.9")
         @info "python version was not in 3.7-3.9 changing python version"
-        CondaPkg.add("python"; version="3.9")
-        @info "python 3.9 installed"
+        CondaPkg.add("python"; version="3.9",resolve=false)
+        CondaPkg.add("rmgmolecule"; version=">=0.3.0", channel="mjohnson541",resolve=false)
+        CondaPkg.add("matplotlib", channel="conda-forge",resolve=false)
+        CondaPkg.add("rdkit", channel="conda-forge",resolve=false)
+        CondaPkg.add("pydot", channel="conda-forge",resolve=false)
+        CondaPkg.resolve()
+    else
+        CondaPkg.add("rmgmolecule"; version=">=0.3.0", channel="mjohnson541",resolve=false)
+        CondaPkg.add("matplotlib", channel="conda-forge",resolve=false)
+        CondaPkg.add("rdkit", channel="conda-forge",resolve=false)
+        CondaPkg.add("pydot", channel="conda-forge",resolve=false)
+        CondaPkg.resolve()
     end
-    CondaPkg.add("rmgmolecule"; version=">=0.3.0", channel="mjohnson541")
     @assert false
-    CondaPkg.add("matplotlib", channel="conda-forge")
-    CondaPkg.add("rdkit", channel="conda-forge")
-    CondaPkg.add("pydot", channel="conda-forge")
-
     Pkgc = Base.require(Base.PkgId(Base.UUID("44cfe95a-1eb2-52ea-b672-e2afdf69b78f"), "Pkg"))
     Pkgc.build("PythonCall")
 end