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

[staging-22.11] python310: 3.10.9 -> 3.10.11; python311: 3.11.1 -> 3.11.3 #225906

Merged
merged 8 commits into from
Apr 13, 2023
Merged

[staging-22.11] python310: 3.10.9 -> 3.10.11; python311: 3.11.1 -> 3.11.3 #225906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
684619a
python310: 3.10.9 -> 3.10.10
mweinelt Feb 8, 2023
9b218a5
python311: 3.11.1 -> 3.11.2
mweinelt Feb 8, 2023
182ecab
python310: 3.10.10 -> 3.10.11
mweinelt Apr 5, 2023
f14f4b0
python311: 3.11.2 -> 3.11.3
mweinelt Apr 5, 2023
27e2c5d
python3.tests.condaExamplePackage: Exclude on non-linux
mweinelt Feb 11, 2023
1a4e94f
python310Packages.ephemeral-port-reserve: Fix tests on darwin
mweinelt Feb 12, 2023
d8b2328
python310Packages.asgiref: Fix tests on darwin
mweinelt Feb 11, 2023
b3fb0f5
python3.tests.nixenv-virtualenv: Fix on darwin
mweinelt Feb 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
8 changes: 4 additions & 4 deletions pkgs/development/interpreters/python/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,10 @@
sourceVersion = {
major = "3";
minor = "10";
patch = "9";
patch = "11";
suffix = "";
};
sha256 = "sha256-WuA+MIJgFkuro5kh/bTb+ObQPYI1qTnUWCsz8LXkaoM=";
sha256 = "sha256-PDvDBIMDchyQSgPrgya2Mekh8RzDvimIRWpC8RXa8Ew=";
};
};

Expand Down Expand Up @@ -195,10 +195,10 @@ in {
sourceVersion = {
major = "3";
minor = "11";
patch = "1";
patch = "3";
suffix = "";
};
sha256 = "sha256-hYeRkvLP/VbLFsCSkFlJ6/Pl45S392RyNSljeQHftY8=";
sha256 = "sha256-il25nJYafs8nx1lWGJyWAslodR8R2+riuQDb/xwIW14=";
inherit (darwin) configd;
inherit passthruFun;
};
Expand Down
5 changes: 3 additions & 2 deletions pkgs/development/interpreters/python/tests.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ let
# Use virtualenv from a Nix env.
nixenv-virtualenv = rec {
env = runCommand "${python.name}-virtualenv" {} ''
${pythonVirtualEnv.interpreter} -m virtualenv $out
${pythonVirtualEnv.interpreter} -m virtualenv venv
mv venv $out
'';
interpreter = "${env}/bin/${python.executable}";
is_venv = "False";
Expand Down Expand Up @@ -173,7 +174,7 @@ let
}
) {};
pythonWithRequests = requests.pythonModule.withPackages (ps: [ requests ]);
in
in lib.optionalAttrs stdenv.isLinux
{
condaExamplePackage = runCommand "import-requests" {} ''
${pythonWithRequests.interpreter} -c "import requests" > $out
Expand Down
2 changes: 2 additions & 0 deletions pkgs/development/python-modules/asgiref/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ buildPythonPackage rec {
"test_multiprocessing"
];

__darwinAllowLocalNetworking = true;

pythonImportsCheck = [ "asgiref" ];

meta = with lib; {
Expand Down
2 changes: 2 additions & 0 deletions pkgs/development/python-modules/ephemeral-port-reserve/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ buildPythonPackage {
"test_fqdn"
];

__darwinAllowLocalNetworking = true;

pythonImportsCheck = [
"ephemeral_port_reserve"
];
Expand Down