Commit Graph

2158 Commits

Author SHA1 Message Date
Wolfgang Walther
8c835e0766 python3Packages.pytestCheckHook: fix Bash heredoc EOF outside subshell (#403973) 2025-05-03 19:51:23 +00:00
Yueh-Shun Li
842f12f8ff python3Packages.pytestCheckHook: format with shfmt 2025-05-04 01:36:44 +08:00
Yueh-Shun Li
63dea02c93 python3Packages.pytestCheckHook: fix Bash heredoc EOF outside subshell
Fix the unterminated here document of the pytest-check-hook.sh
error mesage by moving the EOF of the here document
between the parenthesis of the process substitution.
2025-05-04 01:31:46 +08:00
Tristan Ross
178e906929 pypy: fix prebuild hash for aarch64-linux 2025-05-01 10:15:31 -07:00
Yueh-Shun Li
67564e09a5 buildPython*: pass check-related args whenever specified
Pass
- disabledTestMarks
- disabledTestPaths
- disabledTests
- enabledTestMarks
- enabledTestPaths
- enabledTests
- pytestFlags
- pytestFlagsArray
- unittestFlags
- unittestFlagsArray

whenever they are specified,
no matter if doCheck is true or if they are empty lists.

Simplify the buildPython* argument handling
and bring us closer to the deprecation of overridePythonAttrs
and the adoption of fixed-point arguments.
2025-04-30 06:25:38 +08:00
K900
f96ac2dcd6 Merge remote-tracking branch 'origin/master' into staging-next 2025-04-26 09:07:48 +03:00
Fernando Rodrigues
05580f4b44 treewide: switch instances of lib.teams.*.members to the new meta.teams attribute
Follow-up to #394797.

Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
2025-04-25 22:20:17 -03:00
Ihar Hrachyshka
dd0f03a56c treewide: remove usage of deprecated apple_sdk framework stubs
They are not doing anything right now. This is in preparation for their
complete removal from the tree.

Note: several changes that affect the derivation inputs (e.g. removal of
references to stub paths in build instructions) were left out. They will
be cleaned up the next iteration and will require special care.

Note: this PR is a result of a mix of ugly regex (not AST) based
automation and some manual labor. For reference, the regex automation
part was hacked in: https://github.com/booxter/nix-clean-apple_sdk

Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
2025-04-19 20:28:20 -04:00
K900
73a91e9c9d Merge remote-tracking branch 'origin/staging-next' into staging 2025-04-13 09:07:29 +03:00
nixpkgs-ci[bot]
bd8d4dc802 Merge master into staging-next 2025-04-13 00:41:08 +00:00
Martin Weinelt
8e93fb0f32 python39: drop before the 25.05 branch-off
End of security support is scheduled for 2025-10-31, which does not cover
the complete 25.05 release cycle.
2025-04-13 01:26:42 +02:00
Yueh-Shun Li
bb3a41f312 buildPython*: fix the disabled functionality for overrideAttrs- 2025-04-11 16:34:14 +08:00
Martin Weinelt
c22011ba99 python314: 3.14.0a6 -> 3.14.0a7
https://docs.python.org/3.14/whatsnew/changelog.html#python-3-14-0-alpha-7
2025-04-09 14:21:21 +02:00
Martin Weinelt
8b55cf6245 python313: 3.13.2 -> 3.13.3
https://docs.python.org/release/3.13.2/whatsnew/changelog.html
2025-04-09 14:21:21 +02:00
Martin Weinelt
090848175d python311: 3.11.11 -> 3.11.12
https://docs.python.org/release/3.11.11/whatsnew/changelog.html
2025-04-09 14:21:21 +02:00
Martin Weinelt
2eeda516c8 python310: 3.10.16 -> 3.10.17
https://docs.python.org/release/3.10.16/whatsnew/changelog.html
2025-04-09 14:21:20 +02:00
Martin Weinelt
51b69a3198 python39: 3.9.21 -> 3.9.22
https://docs.python.org/release/3.9.22/whatsnew/changelog.html
2025-04-09 14:21:20 +02:00
Martin Weinelt
8ec5027c89 python312: 3.12.9 -> 3.12.10
https://docs.python.org/release/3.12.10/whatsnew/changelog.html
2025-04-09 13:51:07 +02:00
K900
f42e00d66e Merge remote-tracking branch 'origin/master' into staging-next 2025-04-08 10:29:26 +03:00
Winter
a19cd4ffb1 Revert "treewide: replace rev with tag"
This reverts commit 65a333600d.

This wasn't tested for correctness with something like fodwatch [0],
and should not have been (self-)merged so quickly, especially without
further review.

It also resulted in the breakage of at least one package [1] (and that's
the one we know of and was caught).

A few packages that were updated in between this commit and this revert
were not reverted back to using `rev`, but other than that, this is a
1:1 revert.

[0]: https://codeberg.org/raphaelr/fodwatch
[1]: https://github.com/NixOS/nixpkgs/pull/396904 / 758551e458
2025-04-08 02:57:25 -04:00
K900
b3146d4446 Merge remote-tracking branch 'origin/master' into staging-next 2025-04-07 21:21:10 +03:00
Pol Dellaiera
65a333600d treewide: replace rev with tag 2025-04-07 16:57:22 +02:00
nixpkgs-ci[bot]
1cb902e7f0 Merge master into staging-next 2025-04-05 00:15:16 +00:00
Martin Weinelt
175fb278c1 python3: Fixing excessive memory usage for overriden python in cross-compile (#394541) 2025-04-04 23:26:37 +02:00
nixpkgs-ci[bot]
e739bdf527 Merge staging-next into staging 2025-04-03 18:05:52 +00:00
jopejoe1
578d77eeab pythonInterpreters.pypy39_prebuilt: put deprecation behinde allowAliases 2025-04-03 17:15:54 +02:00
nixpkgs-ci[bot]
76e756ecc3 Merge staging-next into staging 2025-04-02 18:05:39 +00:00
Silvan Mosberger
e52d633a63 Merge remote-tracking branch 'upstream/staging-next' into staging 2025-04-02 18:30:54 +02:00
Timothy Gallion
0ce0b01c12 python3: Remove unneeded override in passthruFun
`pythonOnBuildForHost` is already overriden when it is passed to
`passthruFun` remove redundant override. Performace is slightly better
~200MB less memory.
2025-04-02 06:39:02 -04:00
Timothy Gallion
c59bac08bd python3: Fixing excessive memory usage for overriden python
An attempt to address #338231. The current release of nixpkgs takes over
20GB of memory to evaluate python when the interpreter is overriden.
This adds memoization to the spliced python packages to avoid
evaluating all the commbinations of overrides.
2025-04-02 06:39:02 -04:00
Jörg Thalheim
5bf39d5b41 python3: disable static darwin builds 2025-04-02 11:17:56 +02:00
Silvan Mosberger
374e6bcc40 treewide: Format all Nix files
Format all Nix files using the officially approved formatter,
making the CI check introduced in the previous commit succeed:

  nix-build ci -A fmt.check

This is the next step of the of the [implementation](https://github.com/NixOS/nixfmt/issues/153)
of the accepted [RFC 166](https://github.com/NixOS/rfcs/pull/166).

This commit will lead to merge conflicts for a number of PRs,
up to an estimated ~1100 (~33%) among the PRs with activity in the past 2
months, but that should be lower than what it would be without the previous
[partial treewide format](https://github.com/NixOS/nixpkgs/pull/322537).

Merge conflicts caused by this commit can now automatically be resolved while rebasing using the
[auto-rebase script](8616af08d9/maintainers/scripts/auto-rebase).

If you run into any problems regarding any of this, please reach out to the
[formatting team](https://nixos.org/community/teams/formatting/) by
pinging @NixOS/nix-formatting.
2025-04-01 20:10:43 +02:00
Yueh-Shun Li
d3a452aeec pytestCheckHook: support inclusion and exclusion of path globs, test items, keywords, and markers (#386513) 2025-03-24 07:15:58 +08:00
Yueh-Shun Li
e1e072bf03 python3Packages.pytestCheckHook: support enabledTestMarks and disabledTestMarks 2025-03-23 23:51:16 +08:00
Yueh-Shun Li
f7aeb5a9b7 python3Packages.pytestCheckHook: support enabledTests 2025-03-23 23:51:16 +08:00
Yueh-Shun Li
f51e1c6766 python3Packages.pytestCheckHook: Make disabledTests support sub-expressions
Wrap each elements of disabledTests with parenthesis
so that when __structuredAttrs = true,
people could use sub-expressions an element.

E.g.
```nix
{
  disabledTests = [
    "ClassFoo and test_foo"
    "test_bar"
  ];
}
2025-03-23 23:10:09 +08:00
Yueh-Shun Li
4174f6ed5c python3Packages.pytestCheckHook: support enabledTestPaths 2025-03-23 23:10:04 +08:00
nixpkgs-ci[bot]
f02955ed47 Merge master into staging-next 2025-03-21 18:04:59 +00:00
Ihar Hrachyshka
ef35af3b1a python311: fix _ctypes build on darwin
In Python 3.12+, the -DUSING_APPLE_OS_LIBFFI=1 macro is always set:
25590eb5de

Fixes #390348

Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
2025-03-16 17:38:59 -04:00
nixpkgs-ci[bot]
e8a05cb8da Merge master into staging-next 2025-03-15 18:04:06 +00:00
Martin Weinelt
684efdc40c python314: 3.14.0a5 -> 3.14.0a6
https://docs.python.org/3.14/whatsnew/changelog.html#python-3-14-0-alpha-6
2025-03-15 16:07:11 +01:00
Yueh-Shun Li
16f8b50742 python3Packages.pytestCheckHook: support deselecting tests via disabledTestPaths
Pass disabledTestPaths elements containing double colons (::)
to --deselect instead of --ignore-glob.
2025-03-09 22:20:16 +08:00
Yueh-Shun Li
6bdb735bbe python3Packages.pytestCheckHook: append disableTests flags after disabledTestPaths flags 2025-03-09 22:20:16 +08:00
Yueh-Shun Li
55d08bb886 buildPythonPackage: simplify check-related attribute inheritance 2025-03-07 16:48:04 +08:00
Yueh-Shun Li
9346e6aa5f python3Packages.pytestCheckHook: add tests 2025-03-07 07:14:56 +08:00
Yueh-Shun Li
2e512e7cf7 python3Packages.pytestCheckHook: fix disabledTestPaths glob matching assertion
Errors in Bash's process substitution doesn't get propagated outside.

Replace the process substitution with Python's `-` as /dev/stdin and
Bash's heredoc stdin redirection.
2025-03-07 07:14:56 +08:00
Yueh-Shun Li
ad8dfff2dd buildPythonPackage: add and use lib inheritance 2025-03-02 21:54:05 +08:00
Yueh-Shun Li
f2cbc7da9e buildPythonPackage: sort lib inheritance 2025-03-02 21:51:24 +08:00
Yueh-Shun Li
2aa22b5edc buildPythonPackage: remove obsolete lib inheritance 2025-03-02 21:49:02 +08:00
Yueh-Shun Li
70322e2fa2 buildPythonPackage: format expression 2025-03-02 21:44:43 +08:00