Skip to content

Commit b5da159

Browse files
authored
Urgent: add option to disable numpy install / prevent corruption of conda-forge environments (#1040)
* Option to disable numpy install * Bump version with numpy install fix * Use `satisfied_skip_solve` in `Conda.add`
1 parent bcaba00 commit b5da159

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "PyCall"
22
uuid = "438e738f-606a-5dbb-bf0a-cddfbfd45ab0"
33
authors = ["Steven G. Johnson <[email protected]>", "Yichao Yu <[email protected]>", "Takafumi Arakaki <[email protected]>", "Simon Kornblith <[email protected]>", "Páll Haraldsson <[email protected]>", "Jon Malmaud <[email protected]>", "Jake Bolewski <[email protected]>", "Keno Fischer <[email protected]>", "Joel Mason <[email protected]>", "Jameson Nash <[email protected]>", "The JuliaPy development team"]
4-
version = "1.95.1"
4+
version = "1.95.2"
55

66
[deps]
77
Conda = "8f4d0f93-b110-5947-807f-2305c1781a2d"
@@ -13,7 +13,7 @@ Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
1313
VersionParsing = "81def892-9a0e-5fdd-b105-ffc91e053289"
1414

1515
[compat]
16-
Conda = "1.0"
16+
Conda = "1.9"
1717
MacroTools = "0.4, 0.5"
1818
VersionParsing = "1.0"
1919
julia = "1.4"

deps/build.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ try # make sure deps.jl file is removed on error
7676

7777
use_conda = dirname(python) == abspath(Conda.PYTHONDIR)
7878
if use_conda
79-
Conda.add("numpy")
79+
Conda.add("numpy"; satisfied_skip_solve=true)
8080
end
8181

8282
(libpython, libpy_name) = find_libpython(python)

0 commit comments

Comments
 (0)