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

PR: Build arm64 versions of Spyder's standalone macOS application #21766

Merged
merged 1 commit into from
Feb 6, 2024

Conversation

mrclary
Copy link
Contributor

@mrclary mrclary commented Feb 5, 2024

Description of Changes

Add arm64 to build matrix

  • Update Python to 3.10.11 (arm64 builds not available for Python 3.9 from setup-python)
  • Update DMG name to include Spyder version and architecture

Note that py2app 0.28.5, I believe, should have updated the black recipe and resolved #19743. However, there is still an issue; see ronaldoussoren/py2app#518. The kluges from #21629 are still required.

Fixes #20232

Affirmation

By submitting this Pull Request or typing my (user)name below,
I affirm the Developer Certificate of Origin
with respect to all commits and content included in this PR,
and understand I am releasing the same under Spyder's MIT (Expat) license.

I certify the above statement is true and correct:

@mrclary mrclary self-assigned this Feb 5, 2024
@ccordoba12 ccordoba12 changed the title Build arm64 versions of Spyder's standalone macOS application PR: Build arm64 versions of Spyder's standalone macOS application Feb 5, 2024
@mrclary mrclary marked this pull request as draft February 5, 2024 16:42
@ccordoba12
Copy link
Member

@mrclary, to fix the error on CIs you need to change the Python version in this line

run: touch ${pythonLocation}/lib/python3.9/site-packages/black-23.12.0.dist-info/top_level.txt

to 3.10 and then you need to make the necessary adjustments to this line:

run: cp -v ${pythonLocation}/lib/python3.9/site-packages/629853fdff261ed89b74__mypyc* ${DISTDIR}/Spyder.app/Contents/Resources/lib/python3.9/

by changing the Python version there too and the name of the file 629853fdff261ed89b74__mypyc, which is Python version dependent. For the latter part, you need to install Black in a Python 3.10 env and get it from it.

@ccordoba12
Copy link
Member

And please also revert the version change you just did to py2app because it's not necessary. I mean, I fought a lot in PR #21629 to make our Github workflow work with more recent versions of py2app but I was unable to.

* Update Python to 3.10.11 (arm64 builds not available for Python 3.9 from setup-python)
* Update DMG name to include Spyder version and architecture
@mrclary
Copy link
Contributor Author

mrclary commented Feb 5, 2024

And please also revert the version change you just did to py2app because it's not necessary. I mean, I fought a lot in PR #21629 to make our Github workflow work with more recent versions of py2app but I was unable to.

Thanks for the heads up; I almost went down that rabbit hole 😁.

@mrclary mrclary marked this pull request as ready for review February 5, 2024 18:34
@mrclary
Copy link
Contributor Author

mrclary commented Feb 5, 2024

and the name of the file 629853fdff261ed89b74__mypyc, which is Python version dependent.

FYI, the glob pattern is identical for the Python 3.10.11 environment (629853fdff261ed89b74__mypyc.cpython-310-darwin.so), so no change was needed.

Copy link
Member

@ccordoba12 ccordoba12 left a comment

Choose a reason for hiding this comment

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

Thanks @mrclary!

@ccordoba12 ccordoba12 merged commit 7288eb2 into spyder-ide:5.x Feb 6, 2024
3 checks passed
ccordoba12 added a commit that referenced this pull request Feb 6, 2024
@mrclary mrclary deleted the v5.5.0_1 branch February 6, 2024 03:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants