Merge pull request #914 from kamadorueda/main

refac(back): #0 remove old mypy
fluidattacks · Sep 21, 2022 · 389c77e · 389c77e
2 parents feff9ee + 291f5e7
commit 389c77e
Show file tree

Hide file tree

Showing 13 changed files with 10 additions and 1,004 deletions.
diff --git a/src/args/lint-python/default.nix b/src/args/lint-python/default.nix
@@ -7,7 +7,6 @@
   makeSearchPaths,
   ...
 }: {
-  mypyVersion ? "0.910",
   name,
   python,
   searchPaths,
@@ -32,14 +31,13 @@ makeDerivation {
           bin = listOptional isDarwin __nixpkgs__.clang;
         };
         sourcesYaml =
-          ./.
-          + ({
-              "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});
+          {
+            "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};
         withSetuptools_57_4_0 = true;
         withSetuptoolsScm_5_0_2 = true;
         withWheel_0_37_0 = true;

diff --git a/src/args/lint-python/mypy-0.910/pypi-deps.yaml b/src/args/lint-python/mypy-0.910/pypi-deps.yaml
diff --git a/src/args/lint-python/mypy-0.910/pypi-sources-3.10.yaml b/src/args/lint-python/mypy-0.910/pypi-sources-3.10.yaml
diff --git a/src/args/lint-python/mypy-0.910/pypi-sources-3.7.yaml b/src/args/lint-python/mypy-0.910/pypi-sources-3.7.yaml
diff --git a/src/args/lint-python/mypy-0.910/pypi-sources-3.8.yaml b/src/args/lint-python/mypy-0.910/pypi-sources-3.8.yaml
diff --git a/src/args/lint-python/mypy-0.910/pypi-sources-3.9.yaml b/src/args/lint-python/mypy-0.910/pypi-sources-3.9.yaml
diff --git a/...rgs/lint-python/mypy-0.971/pypi-deps.yaml → src/args/lint-python/pypi-deps.yaml b/...rgs/lint-python/mypy-0.971/pypi-deps.yaml → src/args/lint-python/pypi-deps.yaml
diff --git a/...-python/mypy-0.971/pypi-sources-3.10.yaml → src/args/lint-python/pypi-sources-3.10.yaml b/...-python/mypy-0.971/pypi-sources-3.10.yaml → src/args/lint-python/pypi-sources-3.10.yaml
diff --git a/...t-python/mypy-0.971/pypi-sources-3.7.yaml → src/args/lint-python/pypi-sources-3.7.yaml b/...t-python/mypy-0.971/pypi-sources-3.7.yaml → src/args/lint-python/pypi-sources-3.7.yaml
diff --git a/...t-python/mypy-0.971/pypi-sources-3.8.yaml → src/args/lint-python/pypi-sources-3.8.yaml b/...t-python/mypy-0.971/pypi-sources-3.8.yaml → src/args/lint-python/pypi-sources-3.8.yaml
diff --git a/...t-python/mypy-0.971/pypi-sources-3.9.yaml → src/args/lint-python/pypi-sources-3.9.yaml b/...t-python/mypy-0.971/pypi-sources-3.9.yaml → src/args/lint-python/pypi-sources-3.9.yaml
diff --git a/src/cli/main/__main__.py b/src/cli/main/__main__.py
@@ -661,7 +661,7 @@ def render(self) -> rich.text.Text:
                 text.append("\n")
         else:
             text = rich.text.Text("(none)")
-        return rich.align.Align(text, align="center")
+        return rich.align.Align(text, align="center")  # type: ignore
 
 
 class TuiOutputsTitle(textual.widget.Widget):
@@ -1004,15 +1004,15 @@ def write_provenance(
     attestation["predicate"]["materials"] = [
         {
             "uri": requisite,
-            "hash": dict([hash_.split(":")]),  # type: ignore
+            "hash": dict([hash_.split(":")]),
         }
         for requisite, hash_ in _nix_build_requisites(out)
     ]
 
     attestation["subject"] = [
         {
             "uri": realpath(out),
-            "hash": dict([_nix_hashes(out)[0].split(":")]),  # type: ignore
+            "hash": dict([_nix_hashes(out)[0].split(":")]),
         }
     ]
 

diff --git a/src/evaluator/modules/lint-python/default.nix b/src/evaluator/modules/lint-python/default.nix
@@ -25,14 +25,12 @@
     };
   };
   makeModule = name: {
-    mypyVersion,
     searchPaths,
     python,
     src,
   }: {
     name = "/lintPython/module/${name}";
     value = lintPython {
-      inherit mypyVersion;
       inherit searchPaths;
       inherit name;
       inherit python;
@@ -42,7 +40,6 @@
     };
   };
   makeDirOfModules = name: {
-    mypyVersion,
     searchPaths,
     python,
     src,
@@ -53,7 +50,6 @@
         name = "/lintPython/dirOfModules/${name}/${moduleName}";
         value =
           (makeModule moduleName {
-            inherit mypyVersion;
             inherit searchPaths;
             inherit python;
             src = "${src}/${moduleName}";
@@ -78,10 +74,6 @@ 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" "3.10"];
             };
@@ -116,10 +108,6 @@ 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" "3.10"];
             };