Skip to content
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

Jump to bottom

python312Packages.scipy: 1.14.0 -> 1.14.1 #336290

Merged
merged 3 commits into from
Aug 28, 2024
Merged

python312Packages.scipy: 1.14.0 -> 1.14.1 #336290

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4075c52
python312Packages.scipy: don't use with lib in meta
doronbehar Aug 27, 2024
5d63abe
python312Packages.scipy: use modern deps Python attributes
doronbehar Aug 27, 2024
34123fc
python312Packages.scipy: cleaning + inputs sorting
doronbehar Aug 27, 2024
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
78 changes: 43 additions & 35 deletions pkgs/development/python-modules/scipy/default.nix
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I personally would just sort this alphabetically but we can keep it now that you done it :)

Original file line number Diff line number Diff line change
@@ -1,34 +1,41 @@
{
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
fetchurl,
writeText,
xcbuild,
doronbehar marked this conversation as resolved.
Show resolved Hide resolved
python,
buildPythonPackage,
doronbehar marked this conversation as resolved.
Show resolved Hide resolved
fetchFromGitHub,
fetchpatch,
doronbehar marked this conversation as resolved.
Show resolved Hide resolved

# build-system
cython,
gfortran,
meson-python,
nukeReferences,
pkg-config,
pythran,
wheel,
pkg-config,
doronbehar marked this conversation as resolved.
Show resolved Hide resolved
setuptools,
hypothesis,
pytest7CheckHook,
pytest-xdist,
numpy,
pybind11,
pooch,
xsimd,
xcbuild,

# buildInputs
# Upstream has support for using Darwin's Accelerate package. However this
# requires a Darwin user to work on a nice way to do that via an override.
# See:
# https://github.com/scipy/scipy/blob/v1.14.0/scipy/meson.build#L194-L211
blas,
lapack,
pybind11,
pooch,
xsimd,
doronbehar marked this conversation as resolved.
Show resolved Hide resolved

# dependencies
numpy,

# tests
hypothesis,
pytest7CheckHook,
pytest-xdist,
doronbehar marked this conversation as resolved.
Show resolved Hide resolved

# Reverse dependency
sage,
Expand Down Expand Up @@ -66,12 +73,12 @@ let
in
buildPythonPackage {
inherit pname version;
format = "pyproject";
pyproject = true;

src = fetchFromGitHub {
owner = "scipy";
repo = pname;
rev = "v${version}";
repo = "scipy";
rev = "refs/tags/v${version}";
hash = srcHash;
fetchSubmodules = true;
};
Expand All @@ -95,22 +102,23 @@ buildPythonPackage {
--replace-fail "pybind11>=2.12.0,<2.13.0" "pybind11>=2.12.0" \
'';

nativeBuildInputs = [
cython
gfortran
meson-python
nukeReferences
pythran
pkg-config
wheel
Copy link
Member

@SuperSandro2000 SuperSandro2000 Aug 28, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍🏼 (on the wheel removal)

setuptools
] ++ lib.optionals stdenv.isDarwin [
# Minimal version required according to:
# https://github.com/scipy/scipy/blob/v1.14.0/scipy/meson.build#L185-L188
(xcbuild.override {
sdkVer = "13.3";
})
];
build-system =
[
cython
gfortran
meson-python
nukeReferences
pythran
pkg-config
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some of these belong in nativeBuildInputs. Also, numpy is missing.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some of these belong in nativeBuildInputs. Also, numpy is missing.

The existence and not identicallity of both nativeBuildInputs and build-system is new to me. I am still surprised that you require adding to build-system packages that are already part of dependencies. I also don't think enforcing this is worth it. I plan to open a discourse thread about these policies you started to enforce lately, and that we discussed in the related numpy/scipy threads.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#333221 (comment)

setuptools
]
++ lib.optionals stdenv.isDarwin [
# Minimal version required according to:
# https://github.com/scipy/scipy/blob/v1.14.0/scipy/meson.build#L185-L188
(xcbuild.override {
sdkVer = "13.3";
})
];
doronbehar marked this conversation as resolved.
Show resolved Hide resolved

buildInputs = [
blas
Expand All @@ -120,7 +128,7 @@ buildPythonPackage {
xsimd
];

propagatedBuildInputs = [ numpy ];
dependencies = [ numpy ];

__darwinAllowLocalNetworking = true;

Expand Down Expand Up @@ -211,12 +219,12 @@ buildPythonPackage {

SCIPY_USE_G77_ABI_WRAPPER = 1;

meta = with lib; {
meta = {
changelog = "https://github.com/scipy/scipy/releases/tag/v${version}";
description = "SciPy (pronounced 'Sigh Pie') is open-source software for mathematics, science, and engineering";
downloadPage = "https://github.com/scipy/scipy";
homepage = "https://www.scipy.org/";
license = licenses.bsd3;
maintainers = with maintainers; [ doronbehar ];
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ doronbehar ];
};
}