diff --git a/Project.toml b/Project.toml index 54ae595e..f2462d16 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "PyCall" uuid = "438e738f-606a-5dbb-bf0a-cddfbfd45ab0" authors = ["Steven G. Johnson ", "Yichao Yu ", "Takafumi Arakaki ", "Simon Kornblith ", "Páll Haraldsson ", "Jon Malmaud ", "Jake Bolewski ", "Keno Fischer ", "Joel Mason ", "Jameson Nash ", "The JuliaPy development team"] -version = "1.95.1" +version = "1.95.2" [deps] Conda = "8f4d0f93-b110-5947-807f-2305c1781a2d" @@ -13,7 +13,7 @@ Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b" VersionParsing = "81def892-9a0e-5fdd-b105-ffc91e053289" [compat] -Conda = "1.0" +Conda = "1.9" MacroTools = "0.4, 0.5" VersionParsing = "1.0" julia = "1.4" diff --git a/deps/build.jl b/deps/build.jl index 4dd63826..52b970c8 100644 --- a/deps/build.jl +++ b/deps/build.jl @@ -76,7 +76,7 @@ try # make sure deps.jl file is removed on error use_conda = dirname(python) == abspath(Conda.PYTHONDIR) if use_conda - Conda.add("numpy") + Conda.add("numpy"; satisfied_skip_solve=true) end (libpython, libpy_name) = find_libpython(python)