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

v3.0.0rc1 #3071

Merged
merged 33 commits into from
Aug 7, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
a607d91
Update VERSION.txt
guolinke May 11, 2020
7730d6d
Update VERSION.txt
guolinke May 12, 2020
ed7da4e
Update setup.py
guolinke May 12, 2020
886f967
Update VERSION.txt
guolinke May 12, 2020
5d1bf9f
Update setup.py
guolinke May 12, 2020
461186a
Merge branch 'master' into v3-release
guolinke Jul 21, 2020
58b5e5c
Update VERSION.txt
guolinke Jul 21, 2020
0f89619
Merge branch 'master' into v3-release
guolinke Aug 5, 2020
e62844e
Merge branch 'master' into v3-release
guolinke Aug 6, 2020
9659026
Merge branch 'master' into v3-release
guolinke Aug 6, 2020
a60c22d
Update .appveyor.yml
guolinke Aug 6, 2020
6d42070
Update DESCRIPTION
guolinke Aug 6, 2020
be59538
Apply suggestions from code review
guolinke Aug 6, 2020
0632ed0
Merge branch 'master' into v3-release
guolinke Aug 6, 2020
5ed2abd
Apply suggestions from code review
guolinke Aug 6, 2020
6f14211
Update DESCRIPTION
guolinke Aug 6, 2020
27086f4
Apply suggestions from code review
guolinke Aug 6, 2020
fe90511
Create VERSION.txt
guolinke Aug 6, 2020
c671ceb
Apply suggestions from code review
guolinke Aug 6, 2020
2380c9e
Update .gitignore
guolinke Aug 6, 2020
14da03a
Update recreate-configure.sh
guolinke Aug 6, 2020
a6d7c9c
Update test_r_package.sh
guolinke Aug 6, 2020
13d64a8
Update build-cran-package.sh
guolinke Aug 6, 2020
5b86580
Delete VERSION.txt
guolinke Aug 6, 2020
97a9a9d
Create VERSION.txt
guolinke Aug 6, 2020
48b4778
Update main.yml
guolinke Aug 6, 2020
fb50bde
Update test_r_package_windows.ps1
guolinke Aug 6, 2020
989560e
Update configure
guolinke Aug 6, 2020
739eb50
Update test_r_package_windows.ps1
guolinke Aug 6, 2020
306c147
Update test_r_package.sh
guolinke Aug 6, 2020
16d7559
Delete VERSION.txt
guolinke Aug 6, 2020
f29eb74
Apply suggestions from code review
guolinke Aug 6, 2020
5d79e77
update configure.ac
jameslamb Aug 6, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: 2.3.2.{build}
version: 3.0.0rc1.{build}
guolinke marked this conversation as resolved.
Show resolved Hide resolved

image: Visual Studio 2015
platform: x64
Expand Down
3 changes: 1 addition & 2 deletions .ci/test_r_package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ fi

cd ${BUILD_DIRECTORY}

PKG_TARBALL="lightgbm_${LGB_VER}.tar.gz"
PKG_TARBALL="lightgbm_*.tar.gz"
LOG_FILE_NAME="lightgbm.Rcheck/00check.log"
if [[ $R_BUILD_TYPE == "cmake" ]]; then
Rscript build_r.R --skip-install || exit -1
Expand All @@ -134,7 +134,6 @@ elif [[ $R_BUILD_TYPE == "cran" ]]; then
# on Linux, we recreate configure in CI to test if
# a change in a PR has changed configure.ac
if [[ $OS_NAME == "linux" ]]; then
cp VERSION.txt R-package/src/VERSION.txt
cd ${BUILD_DIRECTORY}/R-package
autoconf \
--output configure \
Expand Down
3 changes: 1 addition & 2 deletions .ci/test_r_package_windows.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ if (($env:COMPILER -eq "MINGW") -and ($env:R_BUILD_TYPE -eq "cmake")) {
cd $env:BUILD_SOURCESDIRECTORY
tzutil /s "GMT Standard Time"
[Void][System.IO.Directory]::CreateDirectory($env:R_LIB_PATH)
$env:LGB_VER = Get-Content -Path VERSION.txt -TotalCount 1

if ($env:R_BUILD_TYPE -eq "cmake") {
if ($env:TOOLCHAIN -eq "MINGW") {
Expand Down Expand Up @@ -142,7 +141,7 @@ Write-Output "Building R package"
# R CMD check is not used for MSVC builds
if ($env:COMPILER -ne "MSVC") {

$PKG_FILE_NAME = "lightgbm_$env:LGB_VER.tar.gz"
$PKG_FILE_NAME = "lightgbm_*.tar.gz"
$LOG_FILE_NAME = "lightgbm.Rcheck/00check.log"

if ($env:R_BUILD_TYPE -eq "cmake") {
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,6 @@ jobs:
export CONDA_ENV="test-env"
export CONDA="$HOME/miniconda"
export PATH="$CONDA/bin:${HOME}/.local/bin:$PATH"
export LGB_VER=$(head -n 1 VERSION.txt)
export R_VERSION="${{ matrix.r_version }}"
export R_BUILD_TYPE="${{ matrix.build_type }}"
$GITHUB_WORKSPACE/.ci/setup.sh
Expand Down
4 changes: 2 additions & 2 deletions R-package/DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: lightgbm
Type: Package
Title: Light Gradient Boosting Machine
Version: 2.3.2
Date: 2019-11-26
Version: 3.0.0-1
Date: 2020-08-06
Authors@R: c(
person("Guolin", "Ke", email = "guolin.ke@microsoft.com", role = c("aut", "cre")),
person("Damien", "Soukhavong", email = "damien.soukhavong@skema.edu", role = c("ctb")),
Expand Down
18 changes: 9 additions & 9 deletions R-package/configure
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for lightgbm 2.3.2.
jameslamb marked this conversation as resolved.
Show resolved Hide resolved
# Generated by GNU Autoconf 2.69 for lightgbm 3.0.0-1.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
Expand Down Expand Up @@ -576,8 +576,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='lightgbm'
PACKAGE_TARNAME='lightgbm'
PACKAGE_VERSION='2.3.2'
PACKAGE_STRING='lightgbm 2.3.2'
PACKAGE_VERSION='3.0.0-1'
PACKAGE_STRING='lightgbm 3.0.0-1'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''

Expand Down Expand Up @@ -1182,7 +1182,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures lightgbm 2.3.2 to adapt to many kinds of systems.
\`configure' configures lightgbm 3.0.0-1 to adapt to many kinds of systems.

Usage: $0 [OPTION]... [VAR=VALUE]...

Expand Down Expand Up @@ -1244,7 +1244,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of lightgbm 2.3.2:";;
short | recursive ) echo "Configuration of lightgbm 3.0.0-1:";;
esac
cat <<\_ACEOF

Expand Down Expand Up @@ -1311,7 +1311,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
lightgbm configure 2.3.2
lightgbm configure 3.0.0-1
generated by GNU Autoconf 2.69

Copyright (C) 2012 Free Software Foundation, Inc.
Expand All @@ -1328,7 +1328,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.

It was created by lightgbm $as_me 2.3.2, which was
It was created by lightgbm $as_me 3.0.0-1, which was
generated by GNU Autoconf 2.69. Invocation command line was

$ $0 $@
Expand Down Expand Up @@ -2377,7 +2377,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by lightgbm $as_me 2.3.2, which was
This file was extended by lightgbm $as_me 3.0.0-1, which was
generated by GNU Autoconf 2.69. Invocation command line was

CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -2430,7 +2430,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
lightgbm config.status 2.3.2
lightgbm config.status 3.0.0-1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"

Expand Down
2 changes: 1 addition & 1 deletion R-package/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# * https://cran.r-project.org/doc/manuals/r-release/R-exts.html#Configure-and-cleanup

AC_PREREQ(2.69)
AC_INIT([lightgbm], [m4_esyscmd_s([cat src/VERSION.txt])], [], [lightgbm], [])
AC_INIT([lightgbm], [3.0.0-1], [], [lightgbm], [])

###########################
# find compiler and flags #
Expand Down
1 change: 0 additions & 1 deletion R-package/recreate-configure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ apt-get install \
-y \
autoconf=${AUTOCONF_VERSION}

cp VERSION.txt R-package/src/
cd R-package
autoconf \
--output configure \
Expand Down
2 changes: 1 addition & 1 deletion VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.3.2
3.0.0rc1
guolinke marked this conversation as resolved.
Show resolved Hide resolved
guolinke marked this conversation as resolved.
Show resolved Hide resolved
1 change: 0 additions & 1 deletion build-cran-package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ mkdir -p ${TEMP_R_DIR}
cp -R R-package/* ${TEMP_R_DIR}
cp -R include ${TEMP_R_DIR}/src/
cp -R src/* ${TEMP_R_DIR}/src/
cp VERSION.txt ${TEMP_R_DIR}/src/

cd ${TEMP_R_DIR}

Expand Down