Skip to content

chore: use scikit-build 0.12#70

Merged
henryiii merged 2 commits into
masterfrom
henryiii/chore/skbuildrc
Aug 11, 2021
Merged

chore: use scikit-build 0.12#70
henryiii merged 2 commits into
masterfrom
henryiii/chore/skbuildrc

Conversation

@henryiii
Copy link
Copy Markdown
Contributor

@henryiii henryiii commented Aug 5, 2021

No description provided.

@henryiii henryiii force-pushed the henryiii/chore/skbuildrc branch from 926736b to 3a14afb Compare August 5, 2021 21:49
Comment thread pyproject.toml
"setuptools>=42",
"wheel",
"scikit-build @ git+https://github.com/scikit-build/scikit-build.git@739238cfdc7224e02651f94b41f2aea1fd84b519",
]
Copy link
Copy Markdown
Contributor

@jcfr jcfr Aug 5, 2021

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

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).

- os: ubuntu-20.04
arch: "s390x"
- os: windows-2016
- os: windows-2019
Copy link
Copy Markdown
Contributor Author

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.

Comment thread pyproject.toml

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

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)

Comment thread scripts/repair_wheel.py
Comment on lines -62 to +63
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}"
Copy link
Copy Markdown
Contributor Author

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.

@henryiii henryiii force-pushed the henryiii/chore/skbuildrc branch from 3a14afb to 1ef50b1 Compare August 11, 2021 15:02
@henryiii henryiii marked this pull request as ready for review August 11, 2021 15:53
@henryiii henryiii changed the title chore: try scikit-build 0.12 pre-release chore: use scikit-build 0.12 Aug 11, 2021
@henryiii henryiii merged commit 5b6a0fc into master Aug 11, 2021
@henryiii henryiii deleted the henryiii/chore/skbuildrc branch August 11, 2021 15:54
@jcfr
Copy link
Copy Markdown
Contributor

jcfr commented Aug 11, 2021

💯 Thanks for taking the time to work on this 🙏

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants