Skip to content

chore: use scikit-build 0.12 #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
henryiii merged 2 commits into from
Aug 11, 2021
+9 −6
Merged

chore: use scikit-build 0.12 #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9090e56
chore: use scikit-build 0.12
henryiii Aug 5, 2021
1ef50b1
fix: further updates, trying windows 2019
henryiii Aug 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ jobs:
arch: "ppc64le"
- os: ubuntu-20.04
arch: "s390x"
- os: windows-2016
- os: windows-2019
Copy link
Copy Markdown
Contributor Author

@henryiii henryiii Aug 6, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the one surprise, by the way. It works fine with windows-2019, but finds GCC with windows-2016. I don't think any of the other things we've tried have this problem, and we test on windows-2016, but it might be worth further investigation.

arch: "AMD64"
- os: windows-2016
- os: windows-2019
arch: "x86"
- os: macos-10.15
arch: "universal2"
Expand Down
7 changes: 5 additions & 2 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
[build-system]
requires = ["setuptools>=42", "wheel", "scikit-build"]
requires = [
"setuptools>=42",
"wheel",
"scikit-build>=0.12",
]
Copy link
Copy Markdown
Contributor

@jcfr jcfr Aug 5, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

May also be worth updating https://github.com/scikit-build/ninja-python-distributions/blob/master/docs/make_a_release.rst to reference this commit. It could be useful to create future pre-release.

Copy link
Copy Markdown
Contributor Author

@henryiii henryiii Aug 6, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is only temporary - once the release is out, we'll update this to scikit-build >= 0.12 Oh, I see what you mean. Yes, that would be very useful to mention, I have to look this syntax up every single time I use it. Ideally in the future, though, we should probably make a "beta" or "RC" release on pypi, then have a job that can run with dev releases enabled, maybe even automatically (will be looking through the resources you sent).

build-backend = "setuptools.build_meta"

[tool.cibuildwheel]
Expand All @@ -19,7 +23,6 @@ manylinux-i686-image = "manylinux1"

[tool.cibuildwheel.macos.environment]
MACOSX_DEPLOYMENT_TARGET = "10.9"
CMAKE_OSX_ARCHITECTURES = "arm64;x86_64"
Copy link
Copy Markdown
Contributor Author

@henryiii henryiii Aug 6, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is no longer required (but not harmful)


[tool.cibuildwheel.windows]
before-all = [
Expand Down
4 changes: 2 additions & 2 deletions scripts/repair_wheel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ def main():
additional_platforms = []
if os_ == "macos":
# first, get the target macOS deployment target from the wheel
match = re.match(r"^.*-macosx_(\d+)_(\d+)_x86_64\.whl$", file.name)
assert match is not None
match = re.match(r"^.*-macosx_(\d+)_(\d+)_.*\.whl$", file.name)
assert match is not None, f"Couldn't match on {file.name}"
Comment on lines -62 to +63
Copy link
Copy Markdown
Contributor Author

@henryiii henryiii Aug 6, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The wheels used to be misnamed (scikit-build didn't understand universal naming), and now they are correctly tagged, so this had to be modified to pick up the correct name.

target = tuple(map(int, match.groups()))

# let's add universal2 platform for this wheel.
Expand Down