Skip to content

Commit

Permalink
Merge pull request #44 from rte-antares-rpackage/fix/cran/issue/m1mac
Browse files Browse the repository at this point in the history
update package, deleting dep rhdf5 to fix cran release of antaresRead
  • Loading branch information
berthetclement authored Jun 27, 2024
2 parents 5e0b4d9 + 2f0df0a commit bb51ed8
Show file tree
Hide file tree
Showing 24 changed files with 206 additions and 1,642 deletions.
16 changes: 9 additions & 7 deletions .Rbuildignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
^.*\.Rproj$
^\.Rproj\.user$
^\.travis\.yml$
^codecov\.yml$
^appveyor\.yml$
^cran-comments\.md$
^CRAN-RELEASE$
^.*\.Rproj$
^\.Rproj\.user$
^\.travis\.yml$
^codecov\.yml$
^appveyor\.yml$
^cran-comments\.md$
^CRAN-RELEASE$
^CRAN-SUBMISSION$
^revdep$
13 changes: 8 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
.Rproj.user
.Rhistory
.RData
.Ruserdata
inst/doc
.Rproj.user
.Rhistory
.RData
.Ruserdata
inst/doc
revdep/checks/
revdep/data.sqlite
revdep/library/
4 changes: 0 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,6 @@ r_github_packages:
#before - Bioconductor-mirror/zlibbioc
# - Bioconductor-mirror/rhdf5
#after
bioc_packages:
- rhdf5
- zlibbioc


r_packages:
- covr
Expand Down
7 changes: 3 additions & 4 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Package: antaresProcessing
Type: Package
Title: 'Antares' Results Processing
Version: 0.18.1
Version: 0.18.2
Authors@R: c(
person("Veronique", "Bachelier", email = "veronique.bachelier@rte-france.com", role = c("aut", "cre")),
person("Tatiana", "Vargas", email = "tatiana.vargas@rte-france.com", role = c("aut", "cre")),
person("Jalal-Edine", "ZAWAM", role = "aut"),
person("Francois", "Guillem", role = "aut"),
person("Benoit", "Thieurmel", role = "aut"),
Expand All @@ -27,13 +27,12 @@ Imports:
methods,
stats
Suggests:
rhdf5 (>= 2.24.0),
parallel,
testthat,
knitr,
rmarkdown,
covr
RoxygenNote: 7.1.2
RoxygenNote: 7.2.2
VignetteBuilder: knitr
Encoding: UTF-8
biocViews: Infrastructure, DataImport
Expand Down
2 changes: 0 additions & 2 deletions NAMESPACE
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
# Generated by roxygen2: do not edit by hand

export(.setAliasH5)
export(addCongestionLink)
export(addDownwardMargin)
export(addExportAndImport)
export(addLoadFactorLink)
export(addNetLoad)
export(addProcessingH5)
export(addUpwardMargin)
export(compare)
export(externalDependency)
Expand Down
4 changes: 4 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
Copyright © 2016 RTE Réseau de transport d’électricité

Changes in version 0.18.2
* delete suggest dependecies `rhdf5` causing error in `AntaresRead`


Changes in version 0.18.1 (2021-10-20)

BUGFIXES:
Expand Down
2 changes: 1 addition & 1 deletion R/addExportAndImport.R
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#'@param x
#' an object of class "antaresDataList" created with the function
#' \code{readAntares}. It has to contain some areas and all the links that are
#' connected to these areas. Moreover the function \code{\link{removeVirtualAreas}} must be call before.
#' connected to these areas. Moreover the function "removeVirtualAreas" must be call before.
#' @param addCapacities
#' If \code{TRUE}, export and import capacities are added.
#' @param opts opts
Expand Down
2 changes: 1 addition & 1 deletion R/compare.R
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#' Compare two simulations or two antaresData
#'
#' \code{compare} has been designed to compare two surpluses created with function
#' \code{\link{surplus}} but it can be used to compare the values of two tables of
#' "surplus" but it can be used to compare the values of two tables of
#' class \code{antaresData} that contain the same type of data.
#'
#' @param x
Expand Down
Loading

0 comments on commit bb51ed8

Please sign in to comment.