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

Move user includes to right before $GLOBAL #1125

Merged
merged 2 commits into from Nov 30, 2023
Merged

Move user includes to right before $GLOBAL #1125

merged 2 commits into from Nov 30, 2023

Conversation

kylebaron
Copy link
Collaborator

@kylebaron kylebaron commented Nov 4, 2023

Before move, could write a function in file included by $INCLUDE that accepted databox type as an argument.

Rationale for the new location: code in $INCLUDE is just user-written code that would otherwise go in $GLOBAL; so it should be reasonable to include it at that point.

This PR also brings test-unit.R into the drone make target so this code will get exercised when testing in CI.

See #1126

@kylebaron kylebaron added this to the Next Version milestone Nov 4, 2023
@kylebaron kylebaron linked an issue Nov 4, 2023 that may be closed by this pull request
@kylebaron kylebaron removed this from the Next Version milestone Nov 4, 2023
@kylebaron kylebaron removed the refactor label Nov 4, 2023
Copy link
Contributor

@kyleam kyleam left a comment

Choose a reason for hiding this comment

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

Looks good to me.

This has a conflict in inst/maintenance/unit-cpp/test-cpp.R, but that is just due to new tests here and new tests from gh-1131. I confirmed that make test-cpp passes when the conflict is resolved by taking the new tests from both sides.

This PR also brings test-unit.R into the drone make target so this code will get exercised when testing in CI.

Nice. Confirmed that I see it in Drone (for example here).

@kyleam kyleam mentioned this pull request Nov 30, 2023
@kylebaron kylebaron merged commit de26361 into main Nov 30, 2023
@kylebaron kylebaron deleted the move-include branch November 30, 2023 15:30
@kylebaron kylebaron mentioned this pull request Dec 2, 2023
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.

Cannot pass databox type into user function included via $INCLUDE
2 participants