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 data-field from RArray #657

Merged
merged 6 commits into from
Mar 30, 2024
Merged

Remove data-field from RArray #657

merged 6 commits into from
Mar 30, 2024

Conversation

CGMossa
Copy link
Member

@CGMossa CGMossa commented Oct 31, 2023

To prepare for reviewing the other RArray PR, I decided to take a look and study this bit first..

I don't see any particular reason to have RArray equipped with a wild pointer.
I've made adjustments so that this is no longer needed / expected.

I'm more interested in feedback on this..... because it is me trying to understand what was solved here.

@CGMossa CGMossa changed the title remove data-field from RArray Remove data-field from RArray Oct 31, 2023
@CGMossa CGMossa marked this pull request as ready for review November 1, 2023 09:57
CHANGELOG.md Outdated Show resolved Hide resolved
Co-authored-by: Josiah Parry <josiah.parry@gmail.com>
@JosiahParry
Copy link
Contributor

@CGMossa I believe that this PR is failing because R-devel is 4.4 now and the windows machine cannot find rtools 44. Do you have the same assessment?

@CGMossa
Copy link
Member Author

CGMossa commented Mar 30, 2024

The issue is with this rextendr snippet:

    if (identical(R.version$crt, "ucrt")) {
      # TODO: update this when R 5.0 is released.
      if (!identical(R.version$major, "4")) {
        cli::cli_abort("rextendr currently supports R 4.x", class = "rextendr_error")
      }

      if (package_version(R.version$minor) >= "3.0") {
        rtools_version <- "43" # nolint: object_usage_linter
      } else {
        rtools_version <- "42" # nolint: object_usage_linter
      }

      rtools_home <- normalizePath(
        Sys.getenv(
          glue("RTOOLS{rtools_version}_HOME"),
          glue("C:\\rtools{rtools_version}")
        ),
        mustWork = TRUE
      )

I can confirm that the failing CI machine is a ucrt enabled one.

We might want to ping @Ilia-Kosenkov for this one.

Copy link
Contributor

@JosiahParry JosiahParry left a comment

Choose a reason for hiding this comment

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

Thank you for confirming.

I am going to merge this PR as it simplifies and clarifies the RArray struct. No modifications to the tests had been made and all pass. The only user facing change is the removal of the data argument from RArray::from_parts() which is a trivial fix for users when they next upgrade—assuming they've done this at all.

We will resolve the rtools 44 issue in another PR as it is out of the scope of this PR

@JosiahParry JosiahParry merged commit 628a3e2 into master Mar 30, 2024
14 of 15 checks passed
@CGMossa CGMossa deleted the remove_data_from_rarray branch April 30, 2024 14:09
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

2 participants