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

[R-package] miscellaneous changes to comply with CRAN requirements #3338

Merged
merged 50 commits into from Oct 8, 2020
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
11bd7e7
[R-package] update DESCRIPTION per CRAN comments
jameslamb Aug 27, 2020
aa1ad24
newlines
jameslamb Aug 27, 2020
c41a947
Apply suggestions from code review
jameslamb Aug 27, 2020
e80cb54
more fixes
jameslamb Aug 28, 2020
400c35b
update Rbuildignore
jameslamb Aug 29, 2020
346766e
Merge branch 'master' into r/description-fixes
jameslamb Aug 30, 2020
6b82785
Merge branch 'master' into r/description-fixes
jameslamb Aug 30, 2020
f61e9f6
Merge branch 'master' into r/description-fixes
jameslamb Sep 2, 2020
541d2d9
more changes
jameslamb Sep 4, 2020
1d102a5
Merge branch 'master' into r/description-fixes
guolinke Sep 6, 2020
d16bafc
more changes per CRAN response
jameslamb Sep 11, 2020
4a9a6f8
add email
jameslamb Sep 11, 2020
173c7dd
run examples in CI
jameslamb Sep 11, 2020
f36b7de
Merge branch 'master' into r/description-fixes
jameslamb Sep 11, 2020
3a0de88
add newest CRAN response
jameslamb Sep 23, 2020
d18cf5c
Merge branch 'r/description-fixes' of github.com:jameslamb/LightGBM i…
jameslamb Sep 23, 2020
8b6a3a7
add Solaris patch
jameslamb Sep 24, 2020
e7eb0c4
update patch
jameslamb Sep 24, 2020
86552d2
another attempt at ifaddrs patch
jameslamb Sep 25, 2020
e1415f7
fix unnecessary comment
jameslamb Sep 25, 2020
f7f3f41
update configure
jameslamb Sep 25, 2020
a9c301a
comments
jameslamb Sep 25, 2020
a75a0e8
bump version
jameslamb Sep 25, 2020
6c37a57
tabs
jameslamb Sep 29, 2020
3aa79b4
fix address alignment, required by cran (#3415)
guolinke Sep 30, 2020
5c19296
[R-package] add new copyright holder in DESCRIPTION (#3409)
jameslamb Sep 26, 2020
1ea66bf
fixing conflicts
jameslamb Sep 30, 2020
cac7cba
[R-package] add new copyright holder in DESCRIPTION (#3409)
jameslamb Sep 26, 2020
4fbf933
trying to fix conflicts
jameslamb Sep 30, 2020
d9aa856
more fixes
jameslamb Sep 30, 2020
82bb6c7
this will work
jameslamb Sep 30, 2020
119c6f3
Merge branch 'master' into r/description-fixes
guolinke Sep 30, 2020
3515aa8
merge master
jameslamb Oct 3, 2020
d23f094
Merge branch 'r/description-fixes' of github.com:jameslamb/LightGBM i…
jameslamb Oct 3, 2020
240fbfe
update cran-comments
jameslamb Oct 3, 2020
9617f34
merge master
jameslamb Oct 4, 2020
a0443de
Merge branch 'master' into r/description-fixes
jameslamb Oct 6, 2020
c10e23d
simplify solaris, add more testing docs
jameslamb Oct 6, 2020
3595584
stuff
jameslamb Oct 6, 2020
fab1234
remove rchck docs
jameslamb Oct 6, 2020
8528853
Merge branch 'master' into r/description-fixes
jameslamb Oct 7, 2020
bc5decf
Apply suggestions from code review
jameslamb Oct 7, 2020
0ab2261
Merge branch 'r/description-fixes' of github.com:jameslamb/LightGBM i…
jameslamb Oct 7, 2020
9d9165a
remove extra use of cat()
jameslamb Oct 7, 2020
465fbc4
change solaris check
jameslamb Oct 7, 2020
988bbf2
update docs
jameslamb Oct 7, 2020
57d9879
remove testing code
jameslamb Oct 7, 2020
46f4c1f
fix warning about cleanup not having execute permissions
jameslamb Oct 7, 2020
c6ff472
fix cmake builds
jameslamb Oct 7, 2020
6c423a5
remove blank line
jameslamb Oct 8, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions .ci/test_r_package.sh
Expand Up @@ -7,6 +7,10 @@ mkdir -p $R_LIB_PATH
export R_LIBS=$R_LIB_PATH
export PATH="$R_LIB_PATH/R/bin:$PATH"

# hack to get around this:
# https://stat.ethz.ch/pipermail/r-package-devel/2020q3/005930.html
export _R_CHECK_SYSTEM_CLOCK_=0
jameslamb marked this conversation as resolved.
Show resolved Hide resolved

# Get details needed for installing R components
#
# NOTES:
Expand Down
4 changes: 4 additions & 0 deletions .ci/test_r_package_windows.ps1
Expand Up @@ -74,6 +74,10 @@ $env:CTAN_MIRROR = "https://ctan.math.illinois.edu/systems/win32/miktex"
$env:CTAN_MIKTEX_ARCHIVE = "$env:CTAN_MIRROR/setup/windows-x64/"
$env:CTAN_PACKAGE_ARCHIVE = "$env:CTAN_MIRROR/tm/packages/"

# hack to get around this:
# https://stat.ethz.ch/pipermail/r-package-devel/2020q3/005930.html
$env:_R_CHECK_SYSTEM_CLOCK_ = 0

if (($env:COMPILER -eq "MINGW") -and ($env:R_BUILD_TYPE -eq "cmake")) {
$env:CXX = "$env:RTOOLS_MINGW_BIN/g++.exe"
$env:CC = "$env:RTOOLS_MINGW_BIN/gcc.exe"
Expand Down
9 changes: 7 additions & 2 deletions R-package/DESCRIPTION
Expand Up @@ -9,7 +9,10 @@ Authors@R: c(
person("Yachen", "Yan", role = c("ctb")),
person("James", "Lamb", email="jaylamb20@gmail.com", role = c("aut"))
)
Description: Tree based algorithms can be improved by introducing boosting frameworks. 'LightGBM' is one such framework, and this package offers an R interface to work with it.
Description: Tree based algorithms can be improved by introducing boosting frameworks.
'LightGBM' is one such framework, based on Ke, Guolin et al. (2017).
See the paper "LightGBM: a highly efficient gradient boosting decision tree", linked below.
This package offers an R interface to work with it.
It is designed to be distributed and efficient with the following advantages:
1. Faster training speed and higher efficiency.
2. Lower memory usage.
Expand All @@ -20,7 +23,9 @@ Description: Tree based algorithms can be improved by introducing boosting frame
Comparison experiments on public datasets suggest that 'LightGBM' can outperform existing boosting frameworks on both efficiency and accuracy, with significantly lower memory consumption. In addition, parallel experiments suggest that in certain circumstances, 'LightGBM' can achieve a linear speed-up in training time by using multiple machines.
Encoding: UTF-8
License: MIT + file LICENSE
URL: https://github.com/Microsoft/LightGBM
URL:
https://github.com/Microsoft/LightGBM,
https://papers.nips.cc/paper/6907-lightgbm-a-highly-efficient-gradient-boosting-decision
BugReports: https://github.com/Microsoft/LightGBM/issues
NeedsCompilation: yes
Biarch: true
Expand Down
23 changes: 2 additions & 21 deletions R-package/LICENSE
@@ -1,21 +1,2 @@
The MIT License (MIT)

Copyright (c) Microsoft Corporation

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
YEAR: 2016
COPYRIGHT HOLDER: Microsoft Corporation
jameslamb marked this conversation as resolved.
Show resolved Hide resolved
103 changes: 103 additions & 0 deletions R-package/cran-comments.md
@@ -1,5 +1,108 @@
# CRAN Submission History

## v3.0.0 - Submission 2 - (August 28, 2020)

### CRAN response

Failing pre-checks.

### `R CMD check` results

* Debian: 2 NOTEs

```text
* checking CRAN incoming feasibility ... NOTE
Maintainer: 'Guolin Ke <guolin.ke@microsoft.com>'

New submission

Possibly mis-spelled words in DESCRIPTION:
Guolin (13:52)
Ke (13:48)
LightGBM (14:20)
al (13:62)
et (13:59)

* checking top-level files ... NOTE
Non-standard files/directories found at top level:
'docs' 'lightgbm-hex-logo.png' 'lightgbm-hex-logo.svg'
```

* Windows: 2 NOTEs

```text
* checking CRAN incoming feasibility ... NOTE
Maintainer: 'Guolin Ke <guolin.ke@microsoft.com>'

New submission

Possibly mis-spelled words in DESCRIPTION:
Guolin (13:52)
Ke (13:48)
LightGBM (14:20)
al (13:62)
et (13:59)

* checking top-level files ... NOTE
Non-standard files/directories found at top level:
'docs' 'lightgbm-hex-logo.png' 'lightgbm-hex-logo.svg'
```

### Maintainer Notes

We should tell them the misspellings note is a false positive.

For the note about included files, that is my fault. I had extra files laying around when I generated the package. I'm surprised to see `docs/` in that list, since it is ignored in `.Rbuildignore`. I even tested that with [the exact code Rbuildignore uses](https://github.com/wch/r-source/blob/9d13622f41cfa0f36db2595bd6a5bf93e2010e21/src/library/tools/R/build.R#L85). For now, I added `rm -r docs/` to `build-cran-package.sh`. We can figure out what is happening with `.Rbuildignore` in the future, but it shouldn't block a release.

## v3.0.0 - Submission 1 - (August 24, 2020)

NOTE: 3.0.0-1 was never released to CRAN. CRAN was on vacation August 14-24, 2020, and in that time version 3.0.0-1 (a release candidate) became 3.0.0.

### CRAN respoonse

> Please only ship the CRAN template for the MIT license.

> Is there some reference about the method you can add in the Description field in the form Authors (year) doi:.....?

> Please fix and resubmit.

### `R CMD check` results

* Debian: 1 NOTE

```text
* checking CRAN incoming feasibility ... NOTE
Maintainer: ‘Guolin Ke <guolin.ke@microsoft.com>’

New submission

License components with restrictions and base license permitting such:
MIT + file LICENSE
```

* Windows: 1 NOTE

```text
* checking CRAN incoming feasibility ... NOTE
Maintainer: 'Guolin Ke <guolin.ke@microsoft.com>'

New submission

License components with restrictions and base license permitting such:
MIT + file LICENSE
```

### Maintainer Notes

Tried updating `LICENSE` file to this template:

```yaml
YEAR: 2016
COPYRIGHT HOLDER: Microsoft Corporation
```

Added a citation and link for [the main paper](https://papers.nips.cc/paper/6907-lightgbm-a-highly-efficient-gradient-boosting-decision) in `DESCRIPTION`.

## v3.0.0-1 - Submission 3 - (August 12, 2020)

### CRAN response
Expand Down
1 change: 1 addition & 0 deletions build-cran-package.sh
Expand Up @@ -33,6 +33,7 @@ cd ${TEMP_R_DIR}
# Remove files not needed for CRAN
echo "Removing files not needed for CRAN"
rm src/install.libs.R
rm -r docs/
rm -r src/cmake/
rm -r inst/
rm -r pkgdown/
Expand Down