More touches

Author: ilevkivskyi

mypy/typeshed/stubs/mypy-native/METADATA.toml

@@ -1 +1 @@
-version = "0.0.*"
+version = "0.0.*"

mypyc/lib-rt/setup.py

@@ -12,67 +12,65 @@
 from distutils.core import Extension, setup
 from typing import Any
 
-kwargs: dict[str, Any]
-if sys.platform == "darwin":
-    kwargs = {"language": "c++"}
-    compile_args = []
-else:
-    kwargs = {}
-    compile_args = ["--std=c++11"]
+C_APIS_TO_TEST = [
+    "init.c",
+    "int_ops.c",
+    "float_ops.c",
+    "list_ops.c",
+    "exc_ops.c",
+    "generic_ops.c",
+    "pythonsupport.c",
+]
 
 
-class build_ext_custom(build_ext):  # noqa: N801
-    def get_library_names(self):
+class BuildExtGtest(build_ext):
+    def get_library_names(self) -> list[str]:
         return ["gtest"]
 
-    def run(self):
+    def run(self) -> None:
+        # Build Google Test, the C++ framework we use for testing C code.
+        # The source code for Google Test is copied to this repository.
         gtest_dir = os.path.abspath(
             os.path.join(os.path.dirname(__file__), "..", "external", "googletest")
         )
-
         os.makedirs(self.build_temp, exist_ok=True)
-
-        # Build Google Test, the C++ framework we use for testing C code.
-        # The source code for Google Test is copied to this repository.
         subprocess.check_call(
             ["make", "-f", os.path.join(gtest_dir, "make", "Makefile"), f"GTEST_DIR={gtest_dir}"],
             cwd=self.build_temp,
         )
-
         self.library_dirs = [self.build_temp]
-
         return build_ext.run(self)
 
 
 if "--run-capi-tests" in sys.argv:
     sys.argv.pop()
+
+    kwargs: dict[str, Any]
+    if sys.platform == "darwin":
+        kwargs = {"language": "c++"}
+        compile_args = []
+    else:
+        kwargs = {}
+        compile_args = ["--std=c++11"]
+
     setup(
         name="test_capi",
         version="0.1",
         ext_modules=[
             Extension(
                 "test_capi",
-                [
-                    "test_capi.cc",
-                    "init.c",
-                    "int_ops.c",
-                    "float_ops.c",
-                    "list_ops.c",
-                    "exc_ops.c",
-                    "generic_ops.c",
-                    "pythonsupport.c",
-                ],
+                ["test_capi.cc"] + C_APIS_TO_TEST,
                 depends=["CPy.h", "mypyc_util.h", "pythonsupport.h"],
                 extra_compile_args=["-Wno-unused-function", "-Wno-sign-compare"] + compile_args,
                 libraries=["gtest"],
                 include_dirs=["../external/googletest", "../external/googletest/include"],
                 **kwargs,
             )
         ],
-        cmdclass={"build_ext": build_ext_custom},
+        cmdclass={"build_ext": BuildExtGtest},
     )
 else:
-    # TODO: this is a stub, we need a way to share common build logic with
+    # TODO: we need a way to share our preferred C flags and get_extension() logic with
     # mypyc/build.py without code duplication.
     setup(
         name="mypy-native",
@@ -82,8 +80,6 @@ def run(self):
                 "native_internal",
                 ["native_internal.c", "init.c", "int_ops.c", "exc_ops.c", "pythonsupport.c"],
                 include_dirs=["."],
-                **kwargs,
             )
         ],
-        cmdclass={"build_ext": build_ext_custom},
     )