Skip to content

Fix divergence between CRAN version and master#6600

Merged
tdhock merged 25 commits intomasterfrom
fix_diverge
Nov 8, 2024
Merged

Fix divergence between CRAN version and master#6600
tdhock merged 25 commits intomasterfrom
fix_diverge

Conversation

@ben-schwen
Copy link
Copy Markdown
Member

@ben-schwen ben-schwen commented Nov 3, 2024

Closes #6587

This PR merge the patch-1.16.2 branch into curent master. After resolving the conflicts it shows that we indeed are only missing #6563

TysonStanley and others added 24 commits August 26, 2024 23:32
@TysonStanley
fix link in vignettes
0c19f13
@TysonStanley
cran release version bump
efcd11a
@MichaelChirico
Initialize 1.16.2 patch release
95deca3
@MichaelChirico
Fix tests failing without Suggests packages (#6403)
f286216
@MichaelChirico
#include <string.h> to use strncpy (#6408)
c9d990f
@MichaelChirico
Correct commented argument name (#6407)
9bf9dd3 
* Correct commented argument name

* also mismatched bmerge() declaration
@aitap @MichaelChirico
Drop direct use of NAMED and LEVELS (#6420)
516679e 
* Drop direct use of NAMED

Since data.table now depends on R >= 3.3, the backports are no longer
needed. Moreover, MAYBE_SHARED is currently a function, while
MAYBE_REFERENCED expands to !NO_REFERENCES (which is a function).

In debugging output, show MAYBE_REFERENCED (NAMED > 0) instead of NAMED.

* Almost drop direct use of LEVELS

getCharCE appeared in R-2.7, making it possible to check for strings
_marked_ as UTF-8 or Latin-1.

There is no marking as ASCII, so fixing IS_ASCII will have to wait for R
>= 4.5.

* NEWS entry for NAMED, LEVELS reduction

* fine-tune NEWS

---------

Co-authored-by: Michael Chirico <chiricom@google.com>
@aitap @MichaelChirico
Add Ivan as role="ctb" (#6428)
796fb07
@kevinushey @MichaelChirico
also check plain '-fopenmp' for gcc (#6418)
6e5021b 
* also check plain '-fopenmp' for gcc (closes #6409)

* update NEWS

* cite in NEWS

---------

Co-authored-by: Michael Chirico <chiricom@google.com>
@MichaelChirico
Correct dev patch version
05e81e8
@MichaelChirico
Add compiled translations (#6414)
7c2ced2 
* Compile .mo files for new translations

* Track new languages' .mo files

* mention omission in NEWS
@joshhwuu @MichaelChirico
Fix char.trunc with NA (#6442)
4ff8a16 
* omit NA in indices

* revisit

* better test

* change order

* NEWS

---------

Co-authored-by: Michael Chirico <chiricom@google.com>
@MichaelChirico
Fix fcase() segfault (#6452) (#6451)
65dd334 
* More descriptive variable names for fcase counting variables

* Fix fcase() segfault (#6452)
@MichaelChirico
Reset dec='\0' to detect numbers while dec is undecided (#6445)
87a3e08
@MichaelChirico
renumber NEWS
c7cda5a
@MichaelChirico
Use %iscall% to handle more general by= inputs correctly (#6499)
0f534fc
@MichaelChirico
fix NEWS #
e9aaf46
@MichaelChirico
extra newline
beb861a
@MichaelChirico
Don't attempt reuseSorting on non-data.table in bmerge (#6502)
f1d586f
@MichaelChirico
Fix NEWS #
a828ef1
@aitap
print.data.table: check for knitr at sys.calls()-6 (#6563)
9de2567
@TysonStanley
patch release on cran
f16111e
@ben-schwen
fix divergence
285b865
@ben-schwen
fix mismerge
d58cff1
@ben-schwen ben-schwen changed the title Fix diverge Fix divergence between CRAN version and master Nov 3, 2024
@codecov
Copy link
Copy Markdown

codecov bot commented Nov 3, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.60%. Comparing base (6f85f86) to head (3819b64).
Report is 2 commits behind head on master.

Additional details and impacted files 
@@           Coverage Diff           @@
##           master    #6600   +/-   ##
=======================================
  Coverage   98.60%   98.60%           
=======================================
  Files          79       79           
  Lines       14516    14518    +2     
=======================================
+ Hits        14314    14316    +2     
  Misses        202      202

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@github-actions
Copy link
Copy Markdown

github-actions bot commented Nov 3, 2024 •
edited
Loading

Comparison Plot

Generated via commit 3819b64

Download link for the artifact containing the test results: ↓ atime-results.zip

Task Duration
R setup and installing dependencies 4 minutes and 40 seconds
Installing different package versions 7 minutes and 50 seconds
Running and plotting the test cases 2 minutes and 28 seconds

@MichaelChirico
Copy link
Copy Markdown
Member

MichaelChirico commented Nov 3, 2024

I believe I saw the 1.16.2 NEWS missing from master too, would you mind merging that in this PR as well?

@ben-schwen
Copy link
Copy Markdown
Member Author

ben-schwen commented Nov 3, 2024

I believe I saw the 1.16.2 NEWS missing from master too, would you mind merging that in this PR as well?

Done, unfortunately I had to renumber the NEWS items manually.

@TysonStanley
Copy link
Copy Markdown
Member

TysonStanley commented Nov 3, 2024

Sorry about that, oversight on my part. Can PR the NEWS as soon as it's accepted to avoid having to renumber too much. Is there a good way to get the rest of the stuff in there or just a larger PR like this one with the relevant commits to the patch?

tdhock
tdhock approved these changes Nov 8, 2024
View reviewed changes
Copy link
Copy Markdown
Member

@tdhock tdhock left a comment

Choose a reason for hiding this comment

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

great thanks

@tdhock tdhock merged commit bc94690 into master Nov 8, 2024
@ben-schwen ben-schwen deleted the fix_diverge branch November 8, 2024 16:10
@MichaelChirico
Copy link
Copy Markdown
Member

MichaelChirico commented Dec 3, 2024

Is there a good way to get the rest of the stuff in there or just a larger PR like this one with the relevant commits to the patch?

I think this is new territory for all the maintainers, open to ideas. It definitely feels a bit clunky.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tdhock tdhock tdhock approved these changes

@MichaelChirico MichaelChirico Awaiting requested review from MichaelChirico MichaelChirico is a code owner

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Master diverges from patch 1.16.2

7 participants

@ben-schwen @MichaelChirico @TysonStanley @tdhock @aitap @kevinushey @joshhwuu