Clean up and fix errors

typechecking poetry.core.masonry

Fix bugs causing tests to fail

[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Add missing imoports to build.py; Use dict instead of toml.items.Table to store intermediate build info in build_ext_modules process

[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Move distutils.extension.Extension import into type-checking block

Fix mypy errors

Define missing BuildFailed exception in setup.py; Rename test fixtures to avoid errors with Windows filenames being too long

Add get_export_symbols() function to ExtBuilder in setup.py for Windows compat

[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Try another fix to Windows build errors

Try another fix to Windows build errors

[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Remove get_export_symbols() function; Add stub functions to init C libs (for Windows compat)

Add libraries to export_symbols (for Windows)

[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Rename folders to avoid path length limit when compiling/linking; Fix typos

Fix linking issues on Windows

Removed generated binary files

Revert changes to extended_no_setup test fixture

Rename ext_pyproj_lib_build_py fixture

Clarify module descriptions in README.rst files

Fix 'extended is not a package' errors when attempting to build extended_no_setup test fixture

Fix paths

Fix call to SdistBuilder.build()

Clean up rebase

[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Fix exception message

Author: dimbleby

src/poetry/core/masonry/builder.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-from pathlib import Path
 from typing import TYPE_CHECKING
 
 

src/poetry/core/masonry/builders/builder.py

@@ -8,7 +8,7 @@
 from collections import defaultdict
 from pathlib import Path
 from typing import TYPE_CHECKING
-from typing import Any, Collection, Optional
+from typing import Any
 
 
 if TYPE_CHECKING:
@@ -326,7 +326,7 @@ def convert_script_files(self) -> list[Path]:
                 source = specification["reference"]
 
                 try:
-                    abs_path = self.get_source_paths(name, [source])[0]
+                    _ = self.get_source_paths(name, [source])[0]
                 except IndexError:
                     raise RuntimeError(
                         f"{source} in script/module specification ({name}) is not"
@@ -337,12 +337,14 @@ def convert_script_files(self) -> list[Path]:
 
                 if not abs_path.exists():
                     raise RuntimeError(
-                        f"{abs_path} in script/module specification ({name}) is not found."
+                        f"{abs_path} in script/module specification ({name}) is not"
+                        " found."
                     )
 
                 if not abs_path.is_file():
                     raise RuntimeError(
-                        f"{abs_path} in script/module specification ({name}) is not a file."
+                        f"{abs_path} in script/module specification ({name}) is not a"
+                        " file."
                     )
 
                 script_files.append(abs_path)
@@ -368,7 +370,7 @@ def convert_libraries(self) -> list[tuple[str, dict[str, Any]]]:
         libraries = []
 
         for name, build_info in self._poetry.local_config.get("libraries", {}).items():
-
+            build_info = dict(build_info)
             build_info["sources"] = [
                 str(src)
                 for src in self.get_source_paths(
@@ -397,7 +399,7 @@ def convert_ext_modules(self) -> list[tuple[str, dict[str, Any]]]:
         for name, build_info in self._poetry.local_config.get(
             "ext_modules", {}
         ).items():
-
+            build_info = dict(build_info)
             build_info["sources"] = [
                 str(src)
                 for src in self.get_source_paths(
@@ -468,7 +470,6 @@ def get_source_paths(
         sources: list[Path] = []
 
         for src in source_paths:
-
             if not src.exists():
                 continue
 

src/poetry/core/masonry/builders/sdist.py

@@ -53,6 +53,10 @@
 EXT_BUILDER_DEF = """\
 
 
+class BuildFailed(Exception):
+    pass
+
+
 class ExtBuilder(build_ext):
 
     def run(self):
@@ -233,11 +237,16 @@ def build_setup(self) -> bytes:
                 ext_modules_line += constructor
             ext_modules_line += "]\n"
             imports.append("from distutils.extension import Extension")
+            imports.append(
+                "from distutils.errors import DistutilsPlatformError,"
+                " DistutilsExecError, CCompilerError"
+            )
+            imports.append("import os")
             before.append(ext_modules_line)
             extra.append("'ext_modules': ext_modules,")
             imports.append("from distutils.command.build_ext import build_ext")
             before.append(EXT_BUILDER_DEF)
-            extra.append("'cmdclass': {'build_ext': ExtBuilder},")  # noqa: FS003
+            extra.append("'cmdclass': {'build_ext': ExtBuilder},")
 
         if self._package.python_versions != "*":
             python_requires = self._meta.requires_python
@@ -361,7 +370,6 @@ def find_nearest_pkg(rel_path: str) -> tuple[str, str]:
         return pkgdir, sorted(packages), pkg_data
 
     def find_files_to_add(self, exclude_build: bool = False) -> set[BuildIncludeFile]:
-
         to_add = super().find_files_to_add(exclude_build)
 
         # add any additional files, starting with all LICENSE files

src/poetry/core/masonry/builders/wheel.py

@@ -154,6 +154,7 @@ def _build(self, wheel: zipfile.ZipFile) -> None:
                 current_path = os.getcwd()
                 try:
                     os.chdir(str(self._path))
+                    assert self._package.build_script is not None
                     self._run_build_script(self._package.build_script)
                 finally:
                     os.chdir(current_path)

tests/fixtures/project_with_groups_and_explicit_default/README.rst

@@ -0,0 +1,10 @@
+#include <Python.h>
+#if defined _WIN32 || defined __CYGWIN__
+extern "C" {
+#endif
+    #include <../lib/mylib/include/mylib.h>
+#if defined _WIN32 || defined __CYGWIN__
+}
+#endif
+
+static PyObject *hello(PyObject *self);

tests/masonry/builders/fixtures/ext_build_py/README.rst

@@ -0,0 +1,15 @@
+
+#ifndef MYLIB
+    #define MYLIB
+    #if defined _WIN32 || defined __CYGWIN__
+        #ifdef __GNUC__
+            #define MYLIB_EXPORT __attribute__ ((dllexport))
+        #else
+            #define MYLIB_EXPORT __declspec(dllexport)
+        #endif
+    #else
+        #define MYLIB_EXPORT __attribute__ ((visibility("default")))
+    #endif
+#endif
+
+MYLIB_EXPORT char* mylib_say_hello();

tests/masonry/builders/fixtures/extended_defined_in_build_py_lib_in_pyproject/build.py tests/masonry/builders/fixtures/ext_build_py/build.py

@@ -1,5 +1,3 @@
-#include <Python.h>
-#include <mylib.h>
 #include <extended.hpp>
 
 

tests/masonry/builders/fixtures/ext_build_py/include/extended.hpp

@@ -0,0 +1,16 @@
+libraries = [
+    (
+        "mylib",
+        {
+            "sources": ["lib/mylib/src/mylib.c"],
+            "include_dirs": [
+                "include",
+                "lib/mylib/include",
+            ],
+        },
+    )
+]
+
+
+def build(setup_kwargs):
+    setup_kwargs.update({"libraries": libraries})

tests/masonry/builders/fixtures/ext_build_py/lib/mylib/include/mylib.h

@@ -0,0 +1,10 @@
+#include <Python.h>
+#if defined _WIN32 || defined __CYGWIN__
+extern "C" {
+#endif
+    #include <../lib/mylib/include/mylib.h>
+#if defined _WIN32 || defined __CYGWIN__
+}
+#endif
+
+static PyObject *hello(PyObject *self);

tests/masonry/builders/fixtures/extended_defined_in_build_py_lib_in_pyproject/lib/mylib/mylib.c tests/masonry/builders/fixtures/ext_build_py/lib/mylib/src/mylib.c

@@ -0,0 +1,15 @@
+
+#ifndef MYLIB
+    #define MYLIB
+    #if defined _WIN32 || defined __CYGWIN__
+        #ifdef __GNUC__
+            #define MYLIB_EXPORT __attribute__ ((dllexport))
+        #else
+            #define MYLIB_EXPORT __declspec(dllexport)
+        #endif
+    #else
+        #define MYLIB_EXPORT __attribute__ ((visibility("default")))
+    #endif
+#endif
+
+MYLIB_EXPORT char* mylib_say_hello();

tests/masonry/builders/fixtures/extended_defined_in_build_py_lib_in_pyproject/pyproject.toml tests/masonry/builders/fixtures/ext_build_py/pyproject.toml

@@ -1,5 +1,3 @@
-#include <Python.h>
-#include <mylib.h>
 #include <extended.hpp>
 
 

tests/masonry/builders/fixtures/extended_defined_in_build_py_lib_in_pyproject/src/extended/__init__.py tests/masonry/builders/fixtures/ext_build_py/src/extended/__init__.py

@@ -0,0 +1,10 @@
+#include <Python.h>
+#if defined _WIN32 || defined __CYGWIN__
+extern "C" {
+#endif
+    #include <../lib/mylib/include/mylib.h>
+#if defined _WIN32 || defined __CYGWIN__
+}
+#endif
+
+static PyObject *hello(PyObject *self);

tests/masonry/builders/fixtures/extended_defined_in_pyproject_lib_in_build_py/src/extended/extended.cpp tests/masonry/builders/fixtures/ext_build_py/src/extended/extended.cpp

@@ -0,0 +1,15 @@
+
+#ifndef MYLIB
+    #define MYLIB
+    #if defined _WIN32 || defined __CYGWIN__
+        #ifdef __GNUC__
+            #define MYLIB_EXPORT __attribute__ ((dllexport))
+        #else
+            #define MYLIB_EXPORT __declspec(dllexport)
+        #endif
+    #else
+        #define MYLIB_EXPORT __attribute__ ((visibility("default")))
+    #endif
+#endif
+
+MYLIB_EXPORT char* mylib_say_hello();

tests/masonry/builders/fixtures/ext_build_py_lib/README.rst

@@ -14,10 +14,10 @@ homepage = "https://python-poetry.org/"
 
 [tool.poetry.libraries.mylib]
 sources = [
-    "lib/mylib/*.c"
+    "lib/mylib/src/*.c"
 ]
 include_dirs = [
-    "include"
+    "lib/mylib/include"
 ]
 
 [tool.poetry.ext_modules."extended.extended"]

tests/masonry/builders/fixtures/ext_build_py_lib/build.py

@@ -1,5 +1,3 @@
-#include <Python.h>
-#include <mylib.h>
 #include <extended.hpp>
 
 

tests/masonry/builders/fixtures/ext_build_py_lib/include/extended.hpp

@@ -53,13 +53,13 @@ def clear_samples_dist() -> None:
     ("dir", "has_build_script"),
     [
         ("extended", True),
-        ("extended_defined_in_pyproject", False),
+        ("ext_pyproj", False),
     ],
 )
 def test_wheel_c_extension(dir: str, has_build_script: bool) -> None:
     module_path = fixtures_dir / dir
 
-    # Perform "clean' build
+    # Perform "clean" build
     setup_file = module_path / "setup.py"
     if setup_file.exists():
         setup_file.unlink()
@@ -119,11 +119,11 @@ def test_wheel_c_extension(dir: str, has_build_script: bool) -> None:
     reason="Disable test on Windows for Python <=3.6 and for PyPy",
 )
 def test_wheel_c_extension_with_no_setup() -> None:
-    module_path = fixtures_dir / "extended_with_no_setup"
+    module_path = fixtures_dir / "extended_no_setup"
     builder = Builder(Factory().create_poetry(module_path))
     builder.build(fmt="all")
 
-    sdist = fixtures_dir / "extended_with_no_setup" / "dist" / "extended-0.1.tar.gz"
+    sdist = fixtures_dir / "extended_no_setup" / "dist" / "extended-0.1.tar.gz"
 
     assert sdist.exists()
 
@@ -229,9 +229,9 @@ def test_wheel_c_extension_src_layout() -> None:
     reason="Disable test on Windows for Python <=3.6 and for PyPy",
 )
 def test_wheel_c_cpp_extensions_defined_in_pyproject() -> None:
-    module_path = fixtures_dir / "extended_with_lib_defined_in_pyproject"
+    module_path = fixtures_dir / "ext_pyproj_lib"
 
-    # Perform "clean' build
+    # Perform "clean" build
     setup_file = module_path / "setup.py"
     if setup_file.exists():
         setup_file.unlink()
@@ -245,10 +245,10 @@ def test_wheel_c_cpp_extensions_defined_in_pyproject() -> None:
 
     with tarfile.open(str(sdist), "r") as tar:
         assert "extended-0.1/setup.py" in tar.getnames()
-        assert "extended-0.1/lib/mylib/mylib.c" in tar.getnames()
+        assert "extended-0.1/lib/mylib/src/mylib.c" in tar.getnames()
         assert "extended-0.1/src/extended/extended.cpp" in tar.getnames()
-        assert "extended-0.1/include/mylib.h" in tar.getnames()
         assert "extended-0.1/include/extended.hpp" in tar.getnames()
+        assert "extended-0.1/lib/mylib/include/mylib.h" in tar.getnames()
 
     whl = list((module_path / "dist").glob("extended-0.1-cp*-cp*-*.whl"))[0]
 
@@ -270,7 +270,7 @@ def test_wheel_c_cpp_extensions_defined_in_pyproject() -> None:
             re.match(
                 f"""(?m)^\
 Wheel-Version: 1.0
-Generator: poetry {__version__}
+Generator: poetry-core {__version__}
 Root-Is-Purelib: false
 Tag: cp[23]_?\\d+-cp[23]_?\\d+m?u?-.+
 $""",
@@ -295,8 +295,8 @@ def test_wheel_c_cpp_extensions_defined_in_pyproject() -> None:
 @pytest.mark.parametrize(
     "dir",
     [
-        "extended_defined_in_pyproject_lib_in_build_py",
-        "extended_defined_in_build_py_lib_in_pyproject",
+        "ext_build_py_lib",
+        "ext_build_py",
     ],
 )
 def test_extensions_defined_in_pyproject_with_build_py_raises_error(dir: str) -> None: