Merge pull request #446 from dirkschumacher/fix/pkg-docs

Fix/pkg docs

.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 }}
@@ -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

.github/workflows/pkgdown.yaml

@@ -17,13 +17,13 @@ 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@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

.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
 

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.9000
 Authors@R: person("Dirk", "Schumacher", email = "[email protected]",
             role = c("aut", "cre"))
 Description: Model mixed integer linear programs in an algebraic way directly in R.
@@ -11,11 +11,11 @@ Description: Model mixed integer linear programs in an algebraic way directly in
              website <https://dirkschumacher.github.io/ompr/> 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
-Depends: R (>= 3.4.0)
+Depends: R (>= 3.5.0)
 Imports:
     lazyeval,
     rlang (>= 0.2.0),

NEWS.md

@@ -1,5 +1,10 @@
 # ompr (development version)
 
+# ompr 1.0.4
+
+* 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
 
 ## Bugfixes

R/ompr-package.R

@@ -7,9 +7,7 @@
 #' to solve a model with different solvers. See the ompr
 #' website <https://dirkschumacher.github.io/ompr/> for more information, documentation and examples.
 #'
-#' @docType package
-#' @keywords package
 #' @keywords internal
 #' @importFrom methods new
 #' @name ompr
-NULL
+"_PACKAGE"

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