From ff3fefee0fd32090dc36e75e0fb1918ac3092f47 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 11 Oct 2022 11:51:27 +1300 Subject: [PATCH] overrides: fix mypy build --- overrides/default.nix | 1 + tests/default.nix | 18 +++++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/overrides/default.nix b/overrides/default.nix index a3204dd..50d3889 100644 --- a/overrides/default.nix +++ b/overrides/default.nix @@ -1200,6 +1200,7 @@ lib.composeManyExtensions [ old: { buildInputs = (old.buildInputs or [ ]) ++ [ self.types-typed-ast + self.types-setuptools ]; # Compile mypy with mypyc, which makes mypy about 4 times faster. The compiled # version is also the default in the wheels on Pypi that include binaries. diff --git a/tests/default.nix b/tests/default.nix index cdffe05..20b1e11 100644 --- a/tests/default.nix +++ b/tests/default.nix @@ -103,15 +103,15 @@ builtins.removeAttrs # Test building poetry inherit poetry; - # Temporarily disabled because of mypy 0.982 - # poetry-env = - # let - # env = poetry2nix.mkPoetryEnv { projectDir = ../pkgs/poetry; }; - # in - # pkgs.runCommand "poetry-env-test" { } '' - # ${env}/bin/python -c 'import requests' - # touch $out - # ''; + poetry-env = + let + env = poetry2nix.mkPoetryEnv { projectDir = ../pkgs/poetry; }; + in + pkgs.runCommand "poetry-env-test" { } '' + ${env}/bin/python -c 'import requests' + ${env}/bin/python -c 'import mypy' + touch $out + ''; dependency-groups = callTest ./dependency-groups { };