Skip to content

Urgent: add option to disable numpy install / prevent corruption of conda-forge environments #1040

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stevengj merged 3 commits into from
Jun 16, 2023
Merged

Urgent: add option to disable numpy install / prevent corruption of conda-forge environments #1040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
00a26c8
Option to disable numpy install
MilesCranmer Jun 12, 2023
e6f3744
Bump version with numpy install fix
MilesCranmer Jun 12, 2023
e6a01f6
Use `satisfied_skip_solve` in `Conda.add`
MilesCranmer Jun 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "PyCall"
uuid = "438e738f-606a-5dbb-bf0a-cddfbfd45ab0"
authors = ["Steven G. Johnson <stevenj@mit.edu>", "Yichao Yu <yyc1992@gmail.com>", "Takafumi Arakaki <aka.tkf@gmail.com>", "Simon Kornblith <simon@simonster.com>", "Páll Haraldsson <Pall.Haraldsson@gmail.com>", "Jon Malmaud <malmaud@gmail.com>", "Jake Bolewski <jakebolewski@gmail.com>", "Keno Fischer <keno@alumni.harvard.edu>", "Joel Mason <jobba1@hotmail.com>", "Jameson Nash <vtjnash@gmail.com>", "The JuliaPy development team"]
version = "1.95.1"
version = "1.95.2"

[deps]
Conda = "8f4d0f93-b110-5947-807f-2305c1781a2d"
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion deps/build.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down