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

buildPythonPackage, buildPythonApplication: support __structuredAttrs = true #347194

Open
wants to merge 14 commits into
base: staging
Choose a base branch
from
Open

buildPythonPackage, buildPythonApplication: support __structuredAttrs = true #347194

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
fa3bb22
pytestCheckHook: support __structuredAttrs
ShamrockLee Oct 9, 2024
d9c7dc1
python3Packages.pytest-xdist: use pytestFlags
ShamrockLee Dec 19, 2024
20feefc
python3Packages.pytest-forked: use pytestFlags
ShamrockLee Dec 19, 2024
dd81f79
pytestCheckHook: lint with ShellCheck
ShamrockLee Oct 6, 2024
a33362c
setuptoolsBuildHook: support __structuredAttrs
ShamrockLee Oct 7, 2024
7b22280
python3packages.mysql-connector: specify setupPyBuildFlags directly w…
ShamrockLee Dec 18, 2024
8bb351d
python3Packages.vowpalwabbit: specify setupPyBuildFlags without Bash-…
ShamrockLee Dec 17, 2024
9717f9a
setuptoolsBuildHook: lint with ShellCheck
ShamrockLee Oct 7, 2024
ec43a14
unittestCheckHook: handle unittestFlagsArray `__structuredAttrs`-agno…
ShamrockLee Oct 7, 2024
5a9cb03
unittestCheckHook: lint with ShellCheck
ShamrockLee Oct 27, 2024
3ed466d
doc: python: elaborate the makeWrapperArgs behaviour
ShamrockLee Dec 21, 2024
c1f48d0
rl-2505.section.md: add entries about buildPython*'s __structuredAttr…
ShamrockLee Dec 16, 2024
e7b6887
python3Packages.conda: use __structuredAttrs = true
ShamrockLee Dec 21, 2024
d19e36e
python3Packages.tensorflow: use __structuredAttrs = true
ShamrockLee Dec 21, 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
2 changes: 2 additions & 0 deletions nixos/doc/manual/release-notes/rl-2505.section.md
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

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

Merge conflict somewhere here on that file.

Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,8 @@

- `python3Packages.conda` now uses `__structuredAttrs = true`.

- `python3Packages.tensorflow` now uses `__structuredAttrs = true`.

Comment on lines +145 to +146
Copy link
Contributor

Choose a reason for hiding this comment

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

Same here.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This might break user-side overriding via overrideAttrs. I'm unsure if we need to keep such interface stable anyway.

Copy link
Contributor

Choose a reason for hiding this comment

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

Any change to a derivation could do so, depending on what you do. I'd say breaking override deserves a note / deprecation etc, but breaking overrideAttrs does not.

Copy link
Member

Choose a reason for hiding this comment

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

tensorflow points at the binary package now, but might point at the source-based one by release. Might be better to pick another test package. Agreed that it doesn't need release note.

- `python3Packages.jaeger-client` was removed because it was deprecated upstream. [OpenTelemetry](https://opentelemetry.io) is the recommended replacement.

- `nodePackages.meshcommander` has been removed, as the package was deprecated by Intel.
Expand Down
6 changes: 5 additions & 1 deletion pkgs/development/python-modules/tensorflow/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -610,6 +610,7 @@ let
};
in
buildPythonPackage {
__structuredAttrs = true;
inherit version pname;
disabled = pythonAtLeast "3.12";

Expand Down Expand Up @@ -639,7 +640,10 @@ buildPythonPackage {
rm $out/bin/tensorboard
'';

setupPyGlobalFlags = [ "--project_name ${pname}" ];
setupPyGlobalFlags = [
"--project_name"
pname
];

# tensorflow/tools/pip_package/setup.py
propagatedBuildInputs = [
Expand Down
Loading