Specify thermo version = 0.1.40 to avoid breaking changes in v0.2.x

stillyslalom · Jul 12, 2021 · ebb441f · ebb441f · stillyslalom · Jul 12, 2021
1 parent 8081144
commit ebb441f
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 7 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,9 +1,10 @@
 name = "PyThermo"
 uuid = "6fae04a5-42e9-4d0c-90a8-26d1a9434b6b"
 authors = ["Alex Ames <[email protected]> and contributors"]
-version = "0.1.2"
+version = "0.1.3"
 
 [deps]
+Conda = "8f4d0f93-b110-5947-807f-2305c1781a2d"
 Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
 PyCall = "438e738f-606a-5dbb-bf0a-cddfbfd45ab0"
 Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"

diff --git a/deps/build.jl b/deps/build.jl
@@ -1,3 +1,4 @@
-using PyCall
+using Conda
 
-pyimport_conda("thermo", "thermo", "conda-forge")
+Conda.add("thermo=0.1.40", channel="conda-forge")
+# pyimport_conda("thermo=0.1.40", "thermo", "conda-forge")
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -2,12 +2,23 @@ using PyThermo
 using Test
 using PyThermo.ShockTube: shockcalc
 using Unitful
+using Conda
 
 @testset "PyThermo.jl" begin
-    SF6 = Species("SF6")
-    @test isapprox(ustrip(density(SF6)), 6.0383, rtol=2e-3)
-    SF6.calculate(T = 500)
-    @test isapprox(ustrip(density(SF6)), 3.5657, rtol=2e-3)
+    @test Conda.version("thermo") <= v"0.1.40"
+
+    @testset "Species" begin
+        SF6 = Species("SF6")
+        @test isapprox(ustrip(density(SF6)), 6.0383, rtol=2e-3)
+        SF6.calculate(T = 500)
+        @test isapprox(ustrip(density(SF6)), 3.5657, rtol=2e-3)
+    end
+    @testset "Mixture" begin
+        HeAce = Mixture(["Helium" => 0.95, "Acetone" => 0.05])
+        ρ_HeAce = HeAce.rho
+        @test !isnothing(ρ_HeAce)
+        @test isapprox(ρ_HeAce, 0.2747138795604815, rtol=2e-3)
+    end
 end
 
 @testset "ShockTube.jl" begin