Merge pull request #912 from kamadorueda/main

feat(back): #0 allow mypy 0.971
fluidattacks · Sep 15, 2022 · dcf42d7 · dcf42d7
2 parents a7a0b98 + d8d09fb
commit dcf42d7
Show file tree

Hide file tree

Showing 12 changed files with 1,040 additions and 9 deletions.
diff --git a/src/args/lint-python/default.nix b/src/args/lint-python/default.nix
@@ -7,6 +7,7 @@
   makeSearchPaths,
   ...
 }: {
+  mypyVersion ? "0.910",
   name,
   python,
   searchPaths,
@@ -31,13 +32,14 @@ makeDerivation {
           bin = listOptional isDarwin __nixpkgs__.clang;
         };
         sourcesYaml =
-          {
-            "3.7" = ./pypi-sources-3.7.yaml;
-            "3.8" = ./pypi-sources-3.8.yaml;
-            "3.9" = ./pypi-sources-3.9.yaml;
-            "3.10" = ./pypi-sources-3.10.yaml;
-          }
-          .${python};
+          ./.
+          + ({
+              "3.7" = "/mypy-${mypyVersion}/pypi-sources-3.7.yaml";
+              "3.8" = "/mypy-${mypyVersion}/pypi-sources-3.8.yaml";
+              "3.9" = "/mypy-${mypyVersion}/pypi-sources-3.9.yaml";
+              "3.10" = "/mypy-${mypyVersion}/pypi-sources-3.10.yaml";
+            }
+            .${python});
         withSetuptools_57_4_0 = true;
         withSetuptoolsScm_5_0_2 = true;
         withWheel_0_37_0 = true;

diff --git a/src/args/lint-python/pypi-deps.yaml → ...rgs/lint-python/mypy-0.910/pypi-deps.yaml b/src/args/lint-python/pypi-deps.yaml → ...rgs/lint-python/mypy-0.910/pypi-deps.yaml
diff --git a/src/args/lint-python/pypi-sources-3.10.yaml → ...-python/mypy-0.910/pypi-sources-3.10.yaml b/src/args/lint-python/pypi-sources-3.10.yaml → ...-python/mypy-0.910/pypi-sources-3.10.yaml
diff --git a/src/args/lint-python/pypi-sources-3.7.yaml → ...t-python/mypy-0.910/pypi-sources-3.7.yaml b/src/args/lint-python/pypi-sources-3.7.yaml → ...t-python/mypy-0.910/pypi-sources-3.7.yaml
diff --git a/src/args/lint-python/pypi-sources-3.8.yaml → ...t-python/mypy-0.910/pypi-sources-3.8.yaml b/src/args/lint-python/pypi-sources-3.8.yaml → ...t-python/mypy-0.910/pypi-sources-3.8.yaml
diff --git a/src/args/lint-python/pypi-sources-3.9.yaml → ...t-python/mypy-0.910/pypi-sources-3.9.yaml b/src/args/lint-python/pypi-sources-3.9.yaml → ...t-python/mypy-0.910/pypi-sources-3.9.yaml
diff --git a/src/args/lint-python/mypy-0.971/pypi-deps.yaml b/src/args/lint-python/mypy-0.971/pypi-deps.yaml
@@ -0,0 +1,4 @@
+---
+mypy: '0.971'
+prospector: 1.5.1
+pylint: 2.11.1
diff --git a/src/args/lint-python/mypy-0.971/pypi-sources-3.10.yaml b/src/args/lint-python/mypy-0.971/pypi-sources-3.10.yaml
diff --git a/src/args/lint-python/mypy-0.971/pypi-sources-3.7.yaml b/src/args/lint-python/mypy-0.971/pypi-sources-3.7.yaml
diff --git a/src/args/lint-python/mypy-0.971/pypi-sources-3.8.yaml b/src/args/lint-python/mypy-0.971/pypi-sources-3.8.yaml
diff --git a/src/args/lint-python/mypy-0.971/pypi-sources-3.9.yaml b/src/args/lint-python/mypy-0.971/pypi-sources-3.9.yaml
diff --git a/src/evaluator/modules/lint-python/default.nix b/src/evaluator/modules/lint-python/default.nix
@@ -25,12 +25,14 @@
     };
   };
   makeModule = name: {
+    mypyVersion,
     searchPaths,
     python,
     src,
   }: {
     name = "/lintPython/module/${name}";
     value = lintPython {
+      inherit mypyVersion;
       inherit searchPaths;
       inherit name;
       inherit python;
@@ -40,6 +42,7 @@
     };
   };
   makeDirOfModules = name: {
+    mypyVersion,
     searchPaths,
     python,
     src,
@@ -50,6 +53,7 @@
         name = "/lintPython/dirOfModules/${name}/${moduleName}";
         value =
           (makeModule moduleName {
+            inherit mypyVersion;
             inherit searchPaths;
             inherit python;
             src = "${src}/${moduleName}";
@@ -74,8 +78,12 @@ in {
         default = {};
         type = lib.types.attrsOf (lib.types.submodule (_: {
           options = {
+            mypyVersion = lib.mkOption {
+              default = "0.910";
+              type = lib.types.enum ["0.910" "0.971"];
+            };
             python = lib.mkOption {
-              type = lib.types.enum ["3.7" "3.8" "3.9"];
+              type = lib.types.enum ["3.7" "3.8" "3.9" "3.10"];
             };
             searchPaths = lib.mkOption {
               default = {};
@@ -108,8 +116,12 @@ in {
         default = {};
         type = lib.types.attrsOf (lib.types.submodule (_: {
           options = {
+            mypyVersion = lib.mkOption {
+              default = "0.910";
+              type = lib.types.enum ["0.910" "0.971"];
+            };
             python = lib.mkOption {
-              type = lib.types.enum ["3.7" "3.8" "3.9"];
+              type = lib.types.enum ["3.7" "3.8" "3.9" "3.10"];
             };
             searchPaths = lib.mkOption {
               default = {};