Skip to content

Commit 86c859b

Browse files
authored
feat: setuptools pyproject-toml only config support (#975)
Support for setuptools extensions without a setup.py. Signed-off-by: Henry Schreiner <[email protected]>
1 parent 2620467 commit 86c859b

File tree

7 files changed

+381
-7
lines changed

7 files changed

+381
-7
lines changed

src/scikit_build_core/setuptools/build_cmake.py

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import setuptools.errors
1010
from packaging.version import Version
1111

12+
from .._compat import tomllib
1213
from .._logging import LEVEL_VALUE, raw_logger
1314
from ..builder.builder import Builder, get_archs
1415
from ..builder.macos import normalize_macos_version
@@ -45,6 +46,17 @@ def _validate_settings(settings: ScikitBuildSettings) -> None:
4546
)
4647

4748

49+
def get_source_dir_from_pyproject_toml() -> str | None:
50+
try:
51+
with Path("pyproject.toml").open("rb") as f:
52+
source_dir: str | None = tomllib.load(f)["tool"]["scikit-build"]["cmake"][
53+
"source-dir"
54+
]
55+
return source_dir
56+
except (FileNotFoundError, KeyError):
57+
return None
58+
59+
4860
class BuildCMake(setuptools.Command):
4961
source_dir: str | None = None
5062
cmake_args: list[str] | str | None = None
@@ -73,7 +85,7 @@ def initialize_options(self) -> None:
7385
self.editable_mode = False
7486
self.parallel = None
7587
self.plat_name = None
76-
self.source_dir = None
88+
self.source_dir = get_source_dir_from_pyproject_toml()
7789
self.cmake_args = None
7890

7991
def finalize_options(self) -> None:
@@ -195,6 +207,8 @@ def finalize_distribution_options(dist: Distribution) -> None:
195207
build.sub_commands.append(
196208
("build_cmake", lambda cmd: _has_cmake(cmd.distribution))
197209
)
210+
if get_source_dir_from_pyproject_toml() is not None:
211+
_cmake_extension(dist)
198212

199213

200214
def _cmake_extension(dist: Distribution) -> None:
@@ -239,6 +253,9 @@ def cmake_source_dir(
239253
dist: Distribution, attr: Literal["cmake_source_dir"], value: str
240254
) -> None:
241255
assert attr == "cmake_source_dir"
256+
if get_source_dir_from_pyproject_toml() is not None:
257+
msg = "cmake_source_dir is already defined in pyproject.toml"
258+
raise setuptools.errors.SetupError(msg)
242259
_cmake_extension(dist)
243260
if not Path(value).is_dir():
244261
msg = "cmake_source_dir must be an existing directory"

tests/conftest.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,15 @@ def package_simple_setuptools_ext(
251251
return package
252252

253253

254+
@pytest.fixture
255+
def package_toml_setuptools_ext(
256+
tmp_path: Path, monkeypatch: pytest.MonkeyPatch
257+
) -> PackageInfo:
258+
package = PackageInfo("toml_setuptools_ext")
259+
process_package(package, tmp_path, monkeypatch)
260+
return package
261+
262+
254263
@pytest.fixture
255264
def package_mixed_setuptools(
256265
tmp_path: Path, monkeypatch: pytest.MonkeyPatch
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
cmake_minimum_required(VERSION 3.15...3.26)
2+
project(
3+
"${SKBUILD_PROJECT_NAME}"
4+
LANGUAGES CXX
5+
VERSION "${SKBUILD_PROJECT_VERSION}")
6+
7+
find_package(pybind11 CONFIG REQUIRED)
8+
pybind11_add_module(cmake_example src/main.cpp)
9+
10+
target_compile_definitions(cmake_example
11+
PRIVATE VERSION_INFO=${PROJECT_VERSION})
12+
13+
install(TARGETS cmake_example LIBRARY DESTINATION .)
Lines changed: 202 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,202 @@
1+
2+
Apache License
3+
Version 2.0, January 2004
4+
http://www.apache.org/licenses/
5+
6+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7+
8+
1. Definitions.
9+
10+
"License" shall mean the terms and conditions for use, reproduction,
11+
and distribution as defined by Sections 1 through 9 of this document.
12+
13+
"Licensor" shall mean the copyright owner or entity authorized by
14+
the copyright owner that is granting the License.
15+
16+
"Legal Entity" shall mean the union of the acting entity and all
17+
other entities that control, are controlled by, or are under common
18+
control with that entity. For the purposes of this definition,
19+
"control" means (i) the power, direct or indirect, to cause the
20+
direction or management of such entity, whether by contract or
21+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
22+
outstanding shares, or (iii) beneficial ownership of such entity.
23+
24+
"You" (or "Your") shall mean an individual or Legal Entity
25+
exercising permissions granted by this License.
26+
27+
"Source" form shall mean the preferred form for making modifications,
28+
including but not limited to software source code, documentation
29+
source, and configuration files.
30+
31+
"Object" form shall mean any form resulting from mechanical
32+
transformation or translation of a Source form, including but
33+
not limited to compiled object code, generated documentation,
34+
and conversions to other media types.
35+
36+
"Work" shall mean the work of authorship, whether in Source or
37+
Object form, made available under the License, as indicated by a
38+
copyright notice that is included in or attached to the work
39+
(an example is provided in the Appendix below).
40+
41+
"Derivative Works" shall mean any work, whether in Source or Object
42+
form, that is based on (or derived from) the Work and for which the
43+
editorial revisions, annotations, elaborations, or other modifications
44+
represent, as a whole, an original work of authorship. For the purposes
45+
of this License, Derivative Works shall not include works that remain
46+
separable from, or merely link (or bind by name) to the interfaces of,
47+
the Work and Derivative Works thereof.
48+
49+
"Contribution" shall mean any work of authorship, including
50+
the original version of the Work and any modifications or additions
51+
to that Work or Derivative Works thereof, that is intentionally
52+
submitted to Licensor for inclusion in the Work by the copyright owner
53+
or by an individual or Legal Entity authorized to submit on behalf of
54+
the copyright owner. For the purposes of this definition, "submitted"
55+
means any form of electronic, verbal, or written communication sent
56+
to the Licensor or its representatives, including but not limited to
57+
communication on electronic mailing lists, source code control systems,
58+
and issue tracking systems that are managed by, or on behalf of, the
59+
Licensor for the purpose of discussing and improving the Work, but
60+
excluding communication that is conspicuously marked or otherwise
61+
designated in writing by the copyright owner as "Not a Contribution."
62+
63+
"Contributor" shall mean Licensor and any individual or Legal Entity
64+
on behalf of whom a Contribution has been received by Licensor and
65+
subsequently incorporated within the Work.
66+
67+
2. Grant of Copyright License. Subject to the terms and conditions of
68+
this License, each Contributor hereby grants to You a perpetual,
69+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70+
copyright license to reproduce, prepare Derivative Works of,
71+
publicly display, publicly perform, sublicense, and distribute the
72+
Work and such Derivative Works in Source or Object form.
73+
74+
3. Grant of Patent License. Subject to the terms and conditions of
75+
this License, each Contributor hereby grants to You a perpetual,
76+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77+
(except as stated in this section) patent license to make, have made,
78+
use, offer to sell, sell, import, and otherwise transfer the Work,
79+
where such license applies only to those patent claims licensable
80+
by such Contributor that are necessarily infringed by their
81+
Contribution(s) alone or by combination of their Contribution(s)
82+
with the Work to which such Contribution(s) was submitted. If You
83+
institute patent litigation against any entity (including a
84+
cross-claim or counterclaim in a lawsuit) alleging that the Work
85+
or a Contribution incorporated within the Work constitutes direct
86+
or contributory patent infringement, then any patent licenses
87+
granted to You under this License for that Work shall terminate
88+
as of the date such litigation is filed.
89+
90+
4. Redistribution. You may reproduce and distribute copies of the
91+
Work or Derivative Works thereof in any medium, with or without
92+
modifications, and in Source or Object form, provided that You
93+
meet the following conditions:
94+
95+
(a) You must give any other recipients of the Work or
96+
Derivative Works a copy of this License; and
97+
98+
(b) You must cause any modified files to carry prominent notices
99+
stating that You changed the files; and
100+
101+
(c) You must retain, in the Source form of any Derivative Works
102+
that You distribute, all copyright, patent, trademark, and
103+
attribution notices from the Source form of the Work,
104+
excluding those notices that do not pertain to any part of
105+
the Derivative Works; and
106+
107+
(d) If the Work includes a "NOTICE" text file as part of its
108+
distribution, then any Derivative Works that You distribute must
109+
include a readable copy of the attribution notices contained
110+
within such NOTICE file, excluding those notices that do not
111+
pertain to any part of the Derivative Works, in at least one
112+
of the following places: within a NOTICE text file distributed
113+
as part of the Derivative Works; within the Source form or
114+
documentation, if provided along with the Derivative Works; or,
115+
within a display generated by the Derivative Works, if and
116+
wherever such third-party notices normally appear. The contents
117+
of the NOTICE file are for informational purposes only and
118+
do not modify the License. You may add Your own attribution
119+
notices within Derivative Works that You distribute, alongside
120+
or as an addendum to the NOTICE text from the Work, provided
121+
that such additional attribution notices cannot be construed
122+
as modifying the License.
123+
124+
You may add Your own copyright statement to Your modifications and
125+
may provide additional or different license terms and conditions
126+
for use, reproduction, or distribution of Your modifications, or
127+
for any such Derivative Works as a whole, provided Your use,
128+
reproduction, and distribution of the Work otherwise complies with
129+
the conditions stated in this License.
130+
131+
5. Submission of Contributions. Unless You explicitly state otherwise,
132+
any Contribution intentionally submitted for inclusion in the Work
133+
by You to the Licensor shall be under the terms and conditions of
134+
this License, without any additional terms or conditions.
135+
Notwithstanding the above, nothing herein shall supersede or modify
136+
the terms of any separate license agreement you may have executed
137+
with Licensor regarding such Contributions.
138+
139+
6. Trademarks. This License does not grant permission to use the trade
140+
names, trademarks, service marks, or product names of the Licensor,
141+
except as required for reasonable and customary use in describing the
142+
origin of the Work and reproducing the content of the NOTICE file.
143+
144+
7. Disclaimer of Warranty. Unless required by applicable law or
145+
agreed to in writing, Licensor provides the Work (and each
146+
Contributor provides its Contributions) on an "AS IS" BASIS,
147+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148+
implied, including, without limitation, any warranties or conditions
149+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150+
PARTICULAR PURPOSE. You are solely responsible for determining the
151+
appropriateness of using or redistributing the Work and assume any
152+
risks associated with Your exercise of permissions under this License.
153+
154+
8. Limitation of Liability. In no event and under no legal theory,
155+
whether in tort (including negligence), contract, or otherwise,
156+
unless required by applicable law (such as deliberate and grossly
157+
negligent acts) or agreed to in writing, shall any Contributor be
158+
liable to You for damages, including any direct, indirect, special,
159+
incidental, or consequential damages of any character arising as a
160+
result of this License or out of the use or inability to use the
161+
Work (including but not limited to damages for loss of goodwill,
162+
work stoppage, computer failure or malfunction, or any and all
163+
other commercial damages or losses), even if such Contributor
164+
has been advised of the possibility of such damages.
165+
166+
9. Accepting Warranty or Additional Liability. While redistributing
167+
the Work or Derivative Works thereof, You may choose to offer,
168+
and charge a fee for, acceptance of support, warranty, indemnity,
169+
or other liability obligations and/or rights consistent with this
170+
License. However, in accepting such obligations, You may act only
171+
on Your own behalf and on Your sole responsibility, not on behalf
172+
of any other Contributor, and only if You agree to indemnify,
173+
defend, and hold each Contributor harmless for any liability
174+
incurred by, or claims asserted against, such Contributor by reason
175+
of your accepting any such warranty or additional liability.
176+
177+
END OF TERMS AND CONDITIONS
178+
179+
APPENDIX: How to apply the Apache License to your work.
180+
181+
To apply the Apache License to your work, attach the following
182+
boilerplate notice, with the fields enclosed by brackets "[]"
183+
replaced with your own identifying information. (Don't include
184+
the brackets!) The text should be enclosed in the appropriate
185+
comment syntax for the file format. We also recommend that a
186+
file or class name and description of purpose be included on the
187+
same "printed page" as the copyright notice for easier
188+
identification within third-party archives.
189+
190+
Copyright 2022 Henry Schreiner
191+
192+
Licensed under the Apache License, Version 2.0 (the "License");
193+
you may not use this file except in compliance with the License.
194+
You may obtain a copy of the License at
195+
196+
http://www.apache.org/licenses/LICENSE-2.0
197+
198+
Unless required by applicable law or agreed to in writing, software
199+
distributed under the License is distributed on an "AS IS" BASIS,
200+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201+
See the License for the specific language governing permissions and
202+
limitations under the License.
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
[build-system]
2+
requires = [
3+
"scikit_build_core",
4+
"setuptools",
5+
"pybind11",
6+
]
7+
build-backend = "scikit_build_core.setuptools.build_meta"
8+
9+
[project]
10+
name = "cmake-example"
11+
version = "0.0.1"
12+
requires-python = ">=3.7"
13+
14+
[tool.scikit-build]
15+
cmake.source-dir = "."
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
#include <pybind11/pybind11.h>
2+
3+
#define STRINGIFY(x) #x
4+
#define MACRO_STRINGIFY(x) STRINGIFY(x)
5+
6+
int add(int i, int j) {
7+
return i + j;
8+
}
9+
10+
namespace py = pybind11;
11+
12+
PYBIND11_MODULE(cmake_example, m) {
13+
m.doc() = R"pbdoc(
14+
Pybind11 example plugin
15+
-----------------------
16+
.. currentmodule:: cmake_example
17+
.. autosummary::
18+
:toctree: _generate
19+
add
20+
subtract
21+
)pbdoc";
22+
23+
m.def("add", &add, R"pbdoc(
24+
Add two numbers
25+
Some other explanation about the add function.
26+
)pbdoc");
27+
28+
m.def("subtract", [](int i, int j) { return i - j; }, R"pbdoc(
29+
Subtract two numbers
30+
Some other explanation about the subtract function.
31+
)pbdoc");
32+
33+
#ifdef VERSION_INFO
34+
m.attr("__version__") = MACRO_STRINGIFY(VERSION_INFO);
35+
#else
36+
m.attr("__version__") = "dev";
37+
#endif
38+
}

0 commit comments

Comments
 (0)