ok robot

Author: thejcannon

gazelle/modules_mapping/def.bzl

@@ -33,7 +33,7 @@ def _modules_mapping_impl(ctx):
     # Run the generator once per-wheel (to leverage caching)
     per_wheel_outputs = []
     for idx, whl in enumerate(all_wheels.to_list()):
-        wheel_modules_mapping = ctx.actions.declare_file("modules_mapping_{}_{}".format(idx, ctx.attr.modules_mapping_name))
+        wheel_modules_mapping = ctx.actions.declare_file("{}.{}".format(modules_mapping.short_path, idx))
         args = ctx.actions.args()
         args.add("--output_file", wheel_modules_mapping.path)
         if ctx.attr.include_stub_packages:

gazelle/modules_mapping/test_merger.py

@@ -8,40 +8,37 @@
 
 class MergerTest(unittest.TestCase):
     def test_merger(self):
-        file1 = tempfile.NamedTemporaryFile("w")
-        json.dump(
-            {
-                "_pytest": "pytest",
-                "_pytest.__init__": "pytest",
-                "_pytest._argcomplete": "pytest",
-                "_pytest.config.argparsing": "pytest",
-            },
-            file1,
-        )
-        file1.flush()
-        file2 = tempfile.NamedTemporaryFile("w")
-        json.dump(
-            {"django_types": "django_types"},
-            file2,
-        )
-        file2.flush()
-        output_file = tempfile.NamedTemporaryFile("r")
-
-        merge_modules_mappings(
-            [pathlib.Path(file1.name), pathlib.Path(file2.name)],
-            pathlib.Path(output_file.name),
-        )
-
-        self.assertEqual(
-            {
-                "_pytest": "pytest",
-                "_pytest.__init__": "pytest",
-                "_pytest._argcomplete": "pytest",
-                "_pytest.config.argparsing": "pytest",
-                "django_types": "django_types",
-            },
-            json.load(output_file),
-        )
+        with tempfile.TemporaryDirectory() as tmpdir:
+            d = pathlib.Path(tmpdir)
+            path1 = d / "file1.json"
+            path2 = d / "file2.json"
+            output_path = d / "output.json"
+
+            path1.write_text(
+                json.dumps(
+                    {
+                        "_pytest": "pytest",
+                        "_pytest.__init__": "pytest",
+                        "_pytest._argcomplete": "pytest",
+                        "_pytest.config.argparsing": "pytest",
+                    }
+                )
+            )
+
+            path2.write_text(json.dumps({"django_types": "django_types"}))
+
+            merge_modules_mappings([path1, path2], output_path)
+
+            self.assertEqual(
+                {
+                    "_pytest": "pytest",
+                    "_pytest.__init__": "pytest",
+                    "_pytest._argcomplete": "pytest",
+                    "_pytest.config.argparsing": "pytest",
+                    "django_types": "django_types",
+                },
+                json.loads(output_path.read_text()),
+            )
 
 
 if __name__ == "__main__":