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

Remove the STATIC macro. #664

Merged
merged 1 commit into from
Feb 29, 2024
Merged

Conversation

Gadgetoid
Copy link
Contributor

Trying to get ahead of the changes proposed in micropython/micropython#13763.

I believe this change can be made safely ahead of MicroPython merging that PR, since STATIC should always resolve to static in production.

Methodology:

  • find -name *.c | xargs sed -Ei "s/(^| )STATIC($| )/\1static\2/" to automate replacement in .c files
  • grep -r STATIC and manual fixes to the docs

@jimmo
Copy link
Contributor

jimmo commented Feb 29, 2024

I believe this change can be made safely ahead of MicroPython merging that PR

Yes, definitely. Good idea @Gadgetoid !

@v923z
Copy link
Owner

v923z commented Feb 29, 2024

Many thanks for keeping an eye on this!

@v923z v923z merged commit 63dfbd1 into v923z:master Feb 29, 2024
16 checks passed
@Gadgetoid
Copy link
Contributor Author

Note: This needs a new compatibility release, since MicroPython have now shipped v1.23.0 with the STATIC macro removed - https://github.com/micropython/micropython/releases/tag/v1.23.0

@v923z
Copy link
Owner

v923z commented Jun 3, 2024

@Gadgetoid I think I'm a bit confused now: the PR addressed the issue of the static keyword ahead of time, so we should be in sync with 1.23, shouldn't we? Or do you just simply want to create a release to indicate this fact?

@Gadgetoid
Copy link
Contributor Author

Or do you just simply want to create a release to indicate this fact?

This! I think it's worth tagging a release though as you point out it's not at all required.

In hindsight I think I've just been submoduling and building against arbitrary points in the master branch anyway 😬

@v923z
Copy link
Owner

v923z commented Jun 3, 2024

I think you bring up a valid point. So, here you go: https://github.com/v923z/micropython-ulab/releases.

@Gadgetoid
Copy link
Contributor Author

Thank you!

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.

None yet

3 participants