Skip to content
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.

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

CI/BLD: move CIBW commands to pyproject.toml, move scripts #328

Merged
merged 2 commits into from
Jul 13, 2024

Conversation

mwtoews
Copy link
Member

@mwtoews mwtoews commented Jul 12, 2024

This PR does the following:

  • Move a few cibuildwheel commands from the CI workflow to pyproject.toml
  • Remove unneeded vcpython27 package installation for Windows (xref this comment)
  • Move a few scripts from ci/ to /scripts
  • The install_libspatialindex.bash script is really just a POSIX shell (i.e. no bash features), so rename and use sh

@@ -1,4 +1,4 @@
#!/bin/bash
#!/bin/sh
Copy link
Collaborator

Choose a reason for hiding this comment

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

For fun, I tried running this script with dash on macOS. I confirmed that it's POSIX compliant. The only issue I encountered is that sha256sum does not exist on macOS, you have to use shasum -a 256 instead. Might be able to check uname in an if-statement if you want to fix this. I can also submit a PR after this one is merged if you want.

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks for checking! It looks like the macos image has sha256sum, probably via brew's coreutils package (the internet tells me at least). But I won't mind if you want to complete this aspect. You can push commits on this PR, if you know how.

Copy link
Collaborator

@adamjstewart adamjstewart Jul 13, 2024

Choose a reason for hiding this comment

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

I confirmed that it's POSIX compliant.

I take this back. == is not POSIX compliant, we should be using = instead. I'll fix this in my commit.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Btw, https://www.shellcheck.net/ is handy if you want to check for POSIX compliance and other sh gotchas.

Copy link
Member Author

Choose a reason for hiding this comment

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

Handy resource! The cli version does nice work too.

@mwtoews mwtoews merged commit 184270d into Toblerity:master Jul 13, 2024
20 checks passed
@mwtoews mwtoews deleted the ci-simplify branch July 13, 2024 12:19
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