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

test: Bump nix devShell python to 3.10 #3914

Merged
merged 2 commits into from
Apr 6, 2023
Merged

test: Bump nix devShell python to 3.10 #3914

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59b07c0
test: Bump nix devShell python to 3.10
dougch Mar 21, 2023
5dc50b5
Merge branch 'main' into nix_py10
dougch Apr 5, 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
11 changes: 5 additions & 6 deletions nix/pyenv.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
{ pkgs }:
let
pythonPkgs = pkgs.python39Packages;
pythonPkgs = pkgs.python310Packages;
cryptography = pythonPkgs.cryptography;
# TODO: move to should we Python 3.10? Not broken there.
# This package is marked at broken on stdenv.isDarwin && stdenv.isAarch64 see https://github.com/pyca/pyopenssl/issues/873
pyOpenSSL = pythonPkgs.pyopenssl;
nassl = with pythonPkgs;
buildPythonPackage rec {
Expand All @@ -13,8 +11,9 @@ let
src = builtins.fetchurl {
# TODO make this work on other platforms: https://pypi.org/project/nassl/5.0.0/#files
url =
"https://files.pythonhosted.org/packages/b2/5b/74deb03184dbd2500a94d6d50c95e48db566653a1c2d5203af7c468bed48/nassl-5.0.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
sha256 = "sha256:02m9p7hq5895674drjn0c98yzlf8lr5yilhg12pzws77720z2a9n";
"https://files.pythonhosted.org/packages/5b/c4/1af344cedf2dff7329d4bdbba03f3512c37b7972e5119fa874fb9472ce00/nassl-5.0.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
sha256 =
"sha256:c2c4ff3d0cb1daae984dc99b6673722263b960fdf0b6aecd2d46020652e4f86f";
};
propagatedBuildInputs = [ pyOpenSSL ];

Expand All @@ -34,7 +33,7 @@ let
pydantic # >=1.7,<1.9 TODO: check if this version is correct/if it matters
];
};
in pkgs.python39.withPackages (ps: [
in pkgs.python310.withPackages (ps: [
ps.pep8
ps.pytest # ==5.3.5 TODO: check if this version is correct/if it matters
ps.pytest-xdist # ==1.34.0 TODO: check if this version is correct/if it matters
Expand Down