From a7b79d53fbff84ba5c7e3a2a675a71e8f945a286 Mon Sep 17 00:00:00 2001 From: Dirk Schumacher Date: Mon, 4 Sep 2023 16:32:57 +0200 Subject: [PATCH 1/9] Fix package documentation --- DESCRIPTION | 2 +- R/ompr-package.R | 4 +--- man/ompr.Rd | 14 +++++++++++++- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index de29f4b..2fbaf36 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -11,7 +11,7 @@ Description: Model mixed integer linear programs in an algebraic way directly in website for more information, documentation and examples. License: MIT + file LICENSE -RoxygenNote: 7.1.2 +RoxygenNote: 7.2.3 Encoding: UTF-8 URL: https://github.com/dirkschumacher/ompr BugReports: https://github.com/dirkschumacher/ompr/issues diff --git a/R/ompr-package.R b/R/ompr-package.R index dd514d2..1a25a13 100644 --- a/R/ompr-package.R +++ b/R/ompr-package.R @@ -7,9 +7,7 @@ #' to solve a model with different solvers. See the ompr #' website for more information, documentation and examples. #' -#' @docType package -#' @keywords package #' @keywords internal #' @importFrom methods new #' @name ompr -NULL +"_PACKAGE" diff --git a/man/ompr.Rd b/man/ompr.Rd index cf135c3..1fa81db 100644 --- a/man/ompr.Rd +++ b/man/ompr.Rd @@ -3,6 +3,7 @@ \docType{package} \name{ompr} \alias{ompr} +\alias{ompr-package} \title{A package to Model (Mixed) Integer Programs} \description{ A package to model (mixed) integer programs. @@ -11,6 +12,17 @@ optimization problems directly in R. The model is solver-independent and thus offers the possibility to solve a model with different solvers. See the ompr website for more information, documentation and examples. +} +\seealso{ +Useful links: +\itemize{ + \item \url{https://github.com/dirkschumacher/ompr} + \item Report bugs at \url{https://github.com/dirkschumacher/ompr/issues} +} + +} +\author{ +\strong{Maintainer}: Dirk Schumacher \email{mail@dirk-schumacher.net} + } \keyword{internal} -\keyword{package} From 6dc91409c9f0e3b2ac60eda088c2d36d5c8d8493 Mon Sep 17 00:00:00 2001 From: Dirk Schumacher Date: Mon, 4 Sep 2023 16:33:09 +0200 Subject: [PATCH 2/9] Increment version number to 1.0.4 --- DESCRIPTION | 2 +- NEWS.md | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 2fbaf36..c87c674 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: ompr Type: Package Title: Model and Solve Mixed Integer Linear Programs -Version: 1.0.3.9000 +Version: 1.0.4 Authors@R: person("Dirk", "Schumacher", email = "mail@dirk-schumacher.net", role = c("aut", "cre")) Description: Model mixed integer linear programs in an algebraic way directly in R. diff --git a/NEWS.md b/NEWS.md index 79330e1..5ae8658 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,6 @@ -# ompr (development version) +# ompr 1.0.4 + +* Improves the package documentation to use the correct alias. No code changes. # ompr 1.0.3 From 54460b2f22fcddf0edce9a49f9d044cab1a2a517 Mon Sep 17 00:00:00 2001 From: Dirk Schumacher Date: Mon, 4 Sep 2023 16:45:24 +0200 Subject: [PATCH 3/9] Move to v2 GH actions --- .github/workflows/R-CMD-check.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index a7dfd0c..94ddb21 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -34,14 +34,14 @@ jobs: - uses: r-lib/actions/setup-pandoc@v1 - - uses: r-lib/actions/setup-r@v1 + - uses: r-lib/actions/setup-r@v2 with: r-version: ${{ matrix.config.r }} http-user-agent: ${{ matrix.config.http-user-agent }} use-public-rspm: true - - uses: r-lib/actions/setup-r-dependencies@v1 + - uses: r-lib/actions/setup-r-dependencies@v2 with: extra-packages: rcmdcheck - - uses: r-lib/actions/check-r-package@v1 + - uses: r-lib/actions/check-r-package@v2 From a14ec17e7e2dfe618a0a379b15c986b48cb12ae7 Mon Sep 17 00:00:00 2001 From: Dirk Schumacher Date: Mon, 4 Sep 2023 21:24:12 +0200 Subject: [PATCH 4/9] Update coverage workflow --- .github/workflows/test-coverage.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml index 3c0da1c..4b01af7 100644 --- a/.github/workflows/test-coverage.yaml +++ b/.github/workflows/test-coverage.yaml @@ -17,11 +17,11 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: r-lib/actions/setup-r@v1 + - uses: r-lib/actions/setup-r@v2 with: use-public-rspm: true - - uses: r-lib/actions/setup-r-dependencies@v1 + - uses: r-lib/actions/setup-r-dependencies@v2 with: extra-packages: covr From 9f2ece5b4f9bdf563ef8db31ef48a731b9dc35e7 Mon Sep 17 00:00:00 2001 From: Dirk Schumacher Date: Mon, 4 Sep 2023 21:24:40 +0200 Subject: [PATCH 5/9] Update pkgdown workflow --- .github/workflows/pkgdown.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml index 1859420..326f0ac 100644 --- a/.github/workflows/pkgdown.yaml +++ b/.github/workflows/pkgdown.yaml @@ -19,11 +19,11 @@ jobs: - uses: r-lib/actions/setup-pandoc@v1 - - uses: r-lib/actions/setup-r@v1 + - uses: r-lib/actions/setup-r@v2 with: use-public-rspm: true - - uses: r-lib/actions/setup-r-dependencies@v1 + - uses: r-lib/actions/setup-r-dependencies@v2 with: extra-packages: pkgdown, dplyr, ROI.plugin.glpk, ompr.roi, ggplot2, purrr, tidyr, ggrepel, viridis needs: website From ae4891908dd553e0227f73b175f3ebbba0d354e3 Mon Sep 17 00:00:00 2001 From: Dirk Schumacher Date: Mon, 4 Sep 2023 22:16:59 +0200 Subject: [PATCH 6/9] Require R 3.5 at least --- .github/workflows/R-CMD-check.yaml | 2 +- DESCRIPTION | 2 +- NEWS.md | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 94ddb21..147b759 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -23,7 +23,7 @@ jobs: - {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'} - {os: ubuntu-latest, r: 'release'} - {os: ubuntu-latest, r: 'oldrel-1'} - - {os: ubuntu-latest, r: '3.4'} + - {os: ubuntu-latest, r: '3.5'} env: GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} diff --git a/DESCRIPTION b/DESCRIPTION index c87c674..8378dc1 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -15,7 +15,7 @@ RoxygenNote: 7.2.3 Encoding: UTF-8 URL: https://github.com/dirkschumacher/ompr BugReports: https://github.com/dirkschumacher/ompr/issues -Depends: R (>= 3.4.0) +Depends: R (>= 3.5.0) Imports: lazyeval, rlang (>= 0.2.0), diff --git a/NEWS.md b/NEWS.md index 5ae8658..09f021b 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,6 +1,7 @@ # ompr 1.0.4 * Improves the package documentation to use the correct alias. No code changes. +* Ompr now requires R 3.5.0 because some dependencies require that now. # ompr 1.0.3 From 51dbaee4bde8464f728f86b782b130709fc72bd7 Mon Sep 17 00:00:00 2001 From: Dirk Schumacher Date: Fri, 8 Sep 2023 22:37:51 +0200 Subject: [PATCH 7/9] Update news and cran comments --- NEWS.md | 2 +- cran-comments.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/NEWS.md b/NEWS.md index 09f021b..4c9188a 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,6 +1,6 @@ # ompr 1.0.4 -* Improves the package documentation to use the correct alias. No code changes. +* Improves the package documentation to use the correct alias. * Ompr now requires R 3.5.0 because some dependencies require that now. # ompr 1.0.3 diff --git a/cran-comments.md b/cran-comments.md index d727e68..ff1604d 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,6 +1,6 @@ ## Test environments -* local Mac OS install, R 4.1.2 -* ubuntu (on github actions/rhub), R release, oldrel, devel, 3.4 +* local Mac OS install, R 4.3.1 +* ubuntu (on github actions), R release, oldrel, devel, 3.5 * Windows (on github actions/win-builder), R release, devel ## R CMD check results From d5922b35fd1c0c717e4bd23a7e2434ebfaf76d1e Mon Sep 17 00:00:00 2001 From: Dirk Schumacher Date: Fri, 8 Sep 2023 22:38:27 +0200 Subject: [PATCH 8/9] Update GH workflow --- .github/workflows/pkgdown.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml index 326f0ac..c8f8139 100644 --- a/.github/workflows/pkgdown.yaml +++ b/.github/workflows/pkgdown.yaml @@ -17,7 +17,7 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: r-lib/actions/setup-pandoc@v1 + - uses: r-lib/actions/setup-pandoc@v2 - uses: r-lib/actions/setup-r@v2 with: From 50a135e880144ac894c5d4a40ecd5a6922ea16ca Mon Sep 17 00:00:00 2001 From: Dirk Schumacher Date: Sat, 9 Sep 2023 12:05:30 +0200 Subject: [PATCH 9/9] Increment version number to 1.0.4.9000 --- DESCRIPTION | 2 +- NEWS.md | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 8378dc1..4e62f6b 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: ompr Type: Package Title: Model and Solve Mixed Integer Linear Programs -Version: 1.0.4 +Version: 1.0.4.9000 Authors@R: person("Dirk", "Schumacher", email = "mail@dirk-schumacher.net", role = c("aut", "cre")) Description: Model mixed integer linear programs in an algebraic way directly in R. diff --git a/NEWS.md b/NEWS.md index 4c9188a..fb9db5c 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,5 @@ +# ompr (development version) + # ompr 1.0.4 * Improves the package documentation to use the correct alias.