Skip to content

Commit

Permalink
v3.0.0rc1 (#3071)
Browse files Browse the repository at this point in the history
* Update VERSION.txt

* Update VERSION.txt

* Update setup.py

* Update VERSION.txt

* Update setup.py

* Update VERSION.txt

* Update .appveyor.yml

* Update DESCRIPTION

* Apply suggestions from code review

* Apply suggestions from code review

* Update DESCRIPTION

* Apply suggestions from code review

* Create VERSION.txt

* Apply suggestions from code review

* Update .gitignore

* Update recreate-configure.sh

* Update test_r_package.sh

* Update build-cran-package.sh

* Delete VERSION.txt

* Create VERSION.txt

* Update main.yml

* Update test_r_package_windows.ps1

* Update configure

* Update test_r_package_windows.ps1

* Update test_r_package.sh

* Delete VERSION.txt

* Apply suggestions from code review

* update configure.ac

Co-authored-by: James Lamb <[email protected]>
  • Loading branch information
guolinke and jameslamb committed Aug 7, 2020
1 parent 53c64ba commit 63c8287
Show file tree
Hide file tree
Showing 10 changed files with 16 additions and 21 deletions.
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}

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 = "[email protected]", role = c("aut", "cre")),
person("Damien", "Soukhavong", email = "[email protected]", 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.
# 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
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

0 comments on commit 63c8287

Please sign in to comment.