From 7d237394e07f2ebae7c7266c0f31b0fd82e0dbb0 Mon Sep 17 00:00:00 2001 From: Patrice Lecharpentier Date: Thu, 29 Jun 2023 09:40:55 +0200 Subject: [PATCH] Plecharpent/release/cran (#21) * news update, date , license file * fix: license * useless * update with latests tests results * fixes: linting, date of release --- DESCRIPTION | 2 +- LICENSE | 165 ----------------------------------------------- LICENSE.md | 163 ---------------------------------------------- NEWS.md | 2 +- R/gen_climate.R | 5 +- cran-comments.md | 77 ++++++++++------------ 6 files changed, 38 insertions(+), 376 deletions(-) delete mode 100644 LICENSE delete mode 100644 LICENSE.md diff --git a/DESCRIPTION b/DESCRIPTION index d3a28cb6..7223d50f 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: SticsRFiles Title: Read and Modify 'STICS' Input/Output Files Version: 1.1.3 -Date: 2023-06-27 +Date: 2023-06-29 Authors@R: c( person("Patrice", "Lecharpentier", , "patrice.lecharpentier@inrae.fr", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-4044-4322")), diff --git a/LICENSE b/LICENSE deleted file mode 100644 index fc8a5de7..00000000 --- a/LICENSE +++ /dev/null @@ -1,165 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - - 0. Additional Definitions. - - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. - - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". - - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - - 1. Exception to Section 3 of the GNU GPL. - - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - - 2. Conveying Modified Versions. - - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or - - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. - - 3. Object Code Incorporating Material from Library Header Files. - - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the object code with a copy of the GNU GPL and this license - document. - - 4. Combined Works. - - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: - - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. - - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. - - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) - - 5. Combined Libraries. - - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. - - Each version is given a distinguishing version number. If the -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. diff --git a/LICENSE.md b/LICENSE.md deleted file mode 100644 index cb564dab..00000000 --- a/LICENSE.md +++ /dev/null @@ -1,163 +0,0 @@ -GNU Lesser General Public License -================================= - -_Version 3, 29 June 2007_ -_Copyright © 2007 Free Software Foundation, Inc. <>_ - -Everyone is permitted to copy and distribute verbatim copies -of this license document, but changing it is not allowed. - - -This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - -### 0. Additional Definitions - -As used herein, “this License” refers to version 3 of the GNU Lesser -General Public License, and the “GNU GPL” refers to version 3 of the GNU -General Public License. - -“The Library” refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - -An “Application” is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - -A “Combined Work” is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the “Linked -Version”. - -The “Minimal Corresponding Source” for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - -The “Corresponding Application Code” for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - -### 1. Exception to Section 3 of the GNU GPL - -You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - -### 2. Conveying Modified Versions - -If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - -* **a)** under this License, provided that you make a good faith effort to -ensure that, in the event an Application does not supply the -function or data, the facility still operates, and performs -whatever part of its purpose remains meaningful, or - -* **b)** under the GNU GPL, with none of the additional permissions of -this License applicable to that copy. - -### 3. Object Code Incorporating Material from Library Header Files - -The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - -* **a)** Give prominent notice with each copy of the object code that the -Library is used in it and that the Library and its use are -covered by this License. -* **b)** Accompany the object code with a copy of the GNU GPL and this license -document. - -### 4. Combined Works - -You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: - -* **a)** Give prominent notice with each copy of the Combined Work that -the Library is used in it and that the Library and its use are -covered by this License. - -* **b)** Accompany the Combined Work with a copy of the GNU GPL and this license -document. - -* **c)** For a Combined Work that displays copyright notices during -execution, include the copyright notice for the Library among -these notices, as well as a reference directing the user to the -copies of the GNU GPL and this license document. - -* **d)** Do one of the following: - - **0)** Convey the Minimal Corresponding Source under the terms of this -License, and the Corresponding Application Code in a form -suitable for, and under terms that permit, the user to -recombine or relink the Application with a modified version of -the Linked Version to produce a modified Combined Work, in the -manner specified by section 6 of the GNU GPL for conveying -Corresponding Source. - - **1)** Use a suitable shared library mechanism for linking with the -Library. A suitable mechanism is one that **(a)** uses at run time -a copy of the Library already present on the user's computer -system, and **(b)** will operate properly with a modified version -of the Library that is interface-compatible with the Linked -Version. - -* **e)** Provide Installation Information, but only if you would otherwise -be required to provide such information under section 6 of the -GNU GPL, and only to the extent that such information is -necessary to install and execute a modified version of the -Combined Work produced by recombining or relinking the -Application with a modified version of the Linked Version. (If -you use option **4d0**, the Installation Information must accompany -the Minimal Corresponding Source and Corresponding Application -Code. If you use option **4d1**, you must provide the Installation -Information in the manner specified by section 6 of the GNU GPL -for conveying Corresponding Source.) - -### 5. Combined Libraries - -You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - -* **a)** Accompany the combined library with a copy of the same work based -on the Library, uncombined with any other library facilities, -conveyed under the terms of this License. -* **b)** Give prominent notice with the combined library that part of it -is a work based on the Library, and explaining where to find the -accompanying uncombined form of the same work. - -### 6. Revised Versions of the GNU Lesser General Public License - -The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License “or any later version” -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - -If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. diff --git a/NEWS.md b/NEWS.md index b4a29a63..66f8dcf1 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# SticsRFiles 1.1.3 _2023-06-27_ +# SticsRFiles 1.1.3 _2023-06-29_ * FUNCTIONS * New function for generating the new_travail.usm STICS file diff --git a/R/gen_climate.R b/R/gen_climate.R index febb821a..ec235af1 100644 --- a/R/gen_climate.R +++ b/R/gen_climate.R @@ -20,13 +20,12 @@ gen_climate <- function(files_path, out_dir) { # generate intermediate paths for a multi-years simulation - # i.e. > 2 + # i.e. over 2 files_path <- complete_climate_paths(files_path) # data concatenation climate_lines <- c() for (i in seq_along(files_path)) { - #out_files_lines[[i]] <- trimws(readLines(files_path[i])) climate_lines <- c(climate_lines, trimws(readLines(files_path[i]))) } @@ -83,7 +82,7 @@ complete_climate_paths <- function(files_path) { years_chr <- as.character(years) file_name <- strsplit(basename(files_path[1]), split = "\\.")[[1]][1] files_path <- file.path( - dirname(files_path[1]), paste0(file_name,".", years_chr) + dirname(files_path[1]), paste0(file_name, ".", years_chr) ) diff --git a/cran-comments.md b/cran-comments.md index 8d1d45c1..544944f2 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,67 +1,58 @@ -## Author's comments +── SticsRFiles 1.1.3: NOTE -* About the License -As I mentionned in my previous submissions, the license CeCILL-C is of the same family as the CeCILL license and is fully compatible with the FSF's LGPL license (see https://en.wikipedia.org/wiki/CeCILL). -I really don't understand why submission would be rejected for that reason. + Build ID: SticsRFiles_1.1.3.tar.gz-c4b9e5e1c0f0486ab292c73748a6ed2a + Platform: Windows Server 2022, R-devel, 64 bit + Submitted: 1h 9m 54.9s ago + Build time: 7m 41.8s -* This is a new release. - -* This is a first submission and the package doesn't have any downstream dependencies yet. - - - -## R CMD check results (first release) - -## Test environments -## Test environments -- R-hub windows-x86_64-devel (r-devel) -- R-hub ubuntu-gcc-release (r-release) -- R-hub fedora-clang-devel (r-devel) - -## R CMD check results -❯ On windows-x86_64-devel (r-devel) - checking CRAN incoming feasibility ... [20s] NOTE +❯ checking CRAN incoming feasibility ... [17s] NOTE + Maintainer: 'Patrice Lecharpentier ' New submission - - Non-FOSS package license (file LICENSE) - Maintainer: 'Patrice Lecharpentier ' -❯ On windows-x86_64-devel (r-devel) - checking for non-standard things in the check directory ... NOTE +❯ checking for non-standard things in the check directory ... NOTE Found the following files/directories: ''NULL'' -❯ On windows-x86_64-devel (r-devel) - checking for detritus in the temp directory ... NOTE +❯ checking for detritus in the temp directory ... NOTE Found the following files/directories: 'lastMiKTeXException' -❯ On ubuntu-gcc-release (r-release) - checking CRAN incoming feasibility ... [5s/21s] NOTE +0 errors ✔ | 0 warnings ✔ | 3 notes ✖ + +── SticsRFiles 1.1.3: NOTE + + Build ID: SticsRFiles_1.1.3.tar.gz-200502a17eab4563a2972360a9407d88 + Platform: Ubuntu Linux 20.04.1 LTS, R-release, GCC + Submitted: 1h 9m 54.9s ago + Build time: 57m 29.5s + +❯ checking CRAN incoming feasibility ... [7s/26s] NOTE Maintainer: ‘Patrice Lecharpentier ’ New submission - - Non-FOSS package license (file LICENSE) -❯ On ubuntu-gcc-release (r-release), fedora-clang-devel (r-devel) - checking for future file timestamps ... NOTE - unable to verify current time - -❯ On ubuntu-gcc-release (r-release), fedora-clang-devel (r-devel) - checking HTML version of manual ... NOTE +❯ checking HTML version of manual ... NOTE Skipping checking HTML validation: no command 'tidy' found -❯ On fedora-clang-devel (r-devel) - checking CRAN incoming feasibility ... [6s/30s] NOTE +0 errors ✔ | 0 warnings ✔ | 2 notes ✖ + +── SticsRFiles 1.1.3: NOTE + + Build ID: SticsRFiles_1.1.3.tar.gz-16096564b3744da893ed5ebd16c3c81f + Platform: Fedora Linux, R-devel, clang, gfortran + Submitted: 1h 9m 54.9s ago + Build time: 54m 54.4s + +❯ checking CRAN incoming feasibility ... [9s/33s] NOTE Maintainer: ‘Patrice Lecharpentier ’ New submission - - Non-FOSS package license (file LICENSE) -0 errors ✔ | 0 warnings ✔ | 7 notes ✖ +❯ checking HTML version of manual ... NOTE + Skipping checking HTML validation: no command 'tidy' found + +0 errors ✔ | 0 warnings ✔ | 2 notes ✖