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

Deprecate --universal2 in favor of universal2-apple-darwin target #1457

Merged
merged 1 commit into from
Feb 3, 2023

Conversation

messense
Copy link
Member

@messense messense commented Feb 3, 2023

Makes the command line options less special for macOS, will remove --universal2 in 1.0.

@netlify
Copy link

netlify bot commented Feb 3, 2023

Deploy Preview for maturin-guide ready!

Name Link
🔨 Latest commit 990bd2b
🔍 Latest deploy log https://app.netlify.com/sites/maturin-guide/deploys/63dc9ba39133be00080bbc2a
😎 Deploy Preview https://deploy-preview-1457--maturin-guide.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

@messense messense changed the title Deprecate --univeral2 instead of universal2-apple-darwin target Deprecate --univeral2 in favor of universal2-apple-darwin target Feb 3, 2023
@messense messense merged commit ec9c99a into PyO3:main Feb 3, 2023
@messense messense deleted the universal2-apple-darwin branch February 3, 2023 09:20
Copy link

@bobzilladev bobzilladev left a comment

Choose a reason for hiding this comment

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

Noticed these, wanted to double check if the actually-checked value was ok (it is), but thought I should point em out.

Also seeing this in the action, but maybe that hasn't been updated yet:

Error: error: Error loading target specification: Could not find specification for target "universal2-apple-darwin". Run rustc --print target-list for a list of built-in targets
at installRustTarget (/Users/runner/work/_actions/PyO3/maturin-action/v1/dist/index.js:11795:15)
at async hostBuild (/Users/runner/work/_actions/PyO3/maturin-action/v1/dist/index.js:11841:5)
at async innerMain (/Users/runner/work/_actions/PyO3/maturin-action/v1/dist/index.js:11966:20)
at async main (/Users/runner/work/_actions/PyO3/maturin-action/v1/dist/index.js:11974:9)

@@ -509,6 +509,12 @@ impl BuildOptions {
let mut target_triple = self.target.clone();

let mut universal2 = self.universal2;
if universal2 {
eprintln!("⚠️ Warning: `--universal2` is deprecated, use `--target univeral2-apple-darwin` instead");

Choose a reason for hiding this comment

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

nit: "univeral2-apple-darwin" is missing an s

@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* Add Cargo compile targets configuration for filtering multiple bin targets in [#1339](https://github.com/PyO3/maturin/pull/1339)
* Respect `rustflags` settings in cargo configuration file in [#1405](https://github.com/PyO3/maturin/pull/1405)
* Bump MSRV to 1.63.0 in [#1407](https://github.com/PyO3/maturin/pull/1407)
* Deprecate `--univeral2` in favor of `universal2-apple-darwin` target in [#1457](https://github.com/PyO3/maturin/pull/1457)

Choose a reason for hiding this comment

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

nit: "univeral2" is missing an s

@messense
Copy link
Member Author

Fixed in 11b0cca, thanks @bobzilladev

@messense messense changed the title Deprecate --univeral2 in favor of universal2-apple-darwin target Deprecate --universal2 in favor of universal2-apple-darwin target Feb 23, 2023
bmwiedemann pushed a commit to bmwiedemann/openSUSE that referenced this pull request Mar 19, 2023
https://build.opensuse.org/request/show/1072766
by user mia + dimstar_suse
- Update to v0.14.15:
  * Add sdist and sccache support to generate-ci command
- Changes in v0.14.14:
  * Add support for Emscripten in generate-ci command
    gh#PyO3/maturin#1484
  * Use default ext_suffix for Emscripten target if not provided in
    PYO3_CONFIG_FILE
    gh#PyO3/maturin#1491
  * Deprecate package.metadata.maturin.data in favor of
    tool.maturin.data in pyproject.toml
    gh#PyO3/maturin#1492

- Update to v0.14.13:
  * maturin develop now looks for a virtualenv .venv in the current
    or any parent directory if no virtual environment is active
    gh#PyO3/maturin#1462
  * Add a new generate-ci command to generate CI configuration
    gh#PyO3/maturin#1456
  * Deprecate --univeral2 in favor of universal2-apple-darwin
    target
    gh#PyO3/maturin#1457
  * Raise an error
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