Skip to content

Commit

Permalink
Fix/ant 713 (#201)
Browse files Browse the repository at this point in the history
* rgeos replaced by sf and raster to terra

* terra removed aggregation done with sf

* github actions :  add coverage 

* check reverse dep : add revdep
  • Loading branch information
berthetclement authored Sep 5, 2023
1 parent a59c581 commit 60a94f8
Show file tree
Hide file tree
Showing 21 changed files with 1,786 additions and 1,546 deletions.
26 changes: 14 additions & 12 deletions .Rbuildignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
^.*\.Rproj$
^\.Rproj\.user$
^appveyor\.yml$
^\.travis\.yml$
^codecov\.yml$
inst/examples
^_pkgdown\.yml$
^docs$
^pkgdown$
^cran-comments\.md$
^CRAN-RELEASE$
^\.github$
^.*\.Rproj$
^\.Rproj\.user$
^appveyor\.yml$
^\.travis\.yml$
^codecov\.yml$
inst/examples
^_pkgdown\.yml$
^docs$
^pkgdown$
^cran-comments\.md$
^CRAN-RELEASE$
^\.github$
^revdep$
^README\.Rmd$
50 changes: 50 additions & 0 deletions .github/workflows/test-coverage.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
branches: [main, master]
pull_request:
branches: [main, master]

name: test-coverage

jobs:
test-coverage:
runs-on: ubuntu-latest
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}

steps:
- uses: actions/checkout@v3

- uses: r-lib/actions/setup-r@v2
with:
use-public-rspm: true

- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: any::covr
needs: coverage

- name: Test coverage
run: |
covr::codecov(
quiet = FALSE,
clean = FALSE,
install_path = file.path(Sys.getenv("RUNNER_TEMP"), "package")
)
shell: Rscript {0}

- name: Show testthat output
if: always()
run: |
## --------------------------------------------------------------------
find ${{ runner.temp }}/package -name 'testthat.Rout*' -exec cat '{}' \; || true
shell: bash

- name: Upload test results
if: failure()
uses: actions/upload-artifact@v3
with:
name: coverage-test-failures
path: ${{ runner.temp }}/package
16 changes: 10 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
.Rproj.user
.Rhistory
.RData
.Ruserdata
inst/examples
inst/doc
.Rproj.user
.Rhistory
.RData
.Ruserdata
.idea
inst/examples
inst/doc
.Rdata
.httr-oauth
.DS_Store
15 changes: 7 additions & 8 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Package: antaresViz
Type: Package
Title: Antares Visualizations
Version: 0.17.1
Version: 0.18.0
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 @@ -23,8 +23,8 @@ License: GPL (>= 2) | file LICENSE
Encoding: UTF-8
Depends:
antaresRead (>= 2.2.9),
antaresProcessing (>= 0.13.0),
spMaps (>= 0.2)
antaresProcessing (>= 0.13.0),
spMaps (>= 0.5.0)
Imports:
dygraphs (>= 1.1.1.6),
shiny (>= 0.13.0),
Expand All @@ -33,9 +33,8 @@ Imports:
htmlwidgets (>= 0.7.0),
manipulateWidget (>= 0.10.0),
leaflet (>= 1.1.0),
sp,
rgeos,
raster,
sp (>= 2.0-0),
sf,
webshot,
data.table,
methods,
Expand All @@ -47,7 +46,7 @@ Imports:
assertthat,
rAmCharts,
utils
RoxygenNote: 7.1.2
RoxygenNote: 7.2.2
Suggests:
testthat,
covr,
Expand Down
149 changes: 74 additions & 75 deletions NAMESPACE
Original file line number Diff line number Diff line change
@@ -1,75 +1,74 @@
# Generated by roxygen2: do not edit by hand

S3method(plot,antaresData)
S3method(plot,list)
S3method(plot,mapLayout)
S3method(plot,simOptions)
export(addShadows)
export(colorScaleOptions)
export(defaultTilesURL)
export(exchangesStack)
export(exchangesStackAliases)
export(getInteractivity)
export(leafletDragPointsOutput)
export(limitSizeGraph)
export(mapLayout)
export(modRpart)
export(modXY)
export(plotMap)
export(plotMapLayout)
export(plotMapOptions)
export(plotThermalGroupCapacities)
export(plotXY)
export(prodStack)
export(prodStackAliases)
export(prodStackExchangesLegend)
export(prodStackLegend)
export(renderLeafletDragPoints)
export(runAppAntaresViz)
export(savePlotAsPng)
export(setExchangesStackAlias)
export(setInteractivity)
export(setProdStackAlias)
export(stackMap)
export(tsLegend)
export(tsPlot)
import(antaresProcessing)
import(antaresRead)
import(assertthat)
import(data.table)
import(dygraphs)
import(htmltools)
import(leaflet)
import(leaflet.minicharts)
import(manipulateWidget)
import(rAmCharts)
import(shiny)
import(sp)
import(spMaps)
importFrom(geojsonio,geojson_json)
importFrom(grDevices,col2rgb)
importFrom(grDevices,colorRampPalette)
importFrom(grDevices,colors)
importFrom(grDevices,gray)
importFrom(grDevices,rainbow)
importFrom(grDevices,rgb)
importFrom(graphics,par)
importFrom(graphics,plot.default)
importFrom(methods,is)
importFrom(plotly,add_bars)
importFrom(plotly,add_heatmap)
importFrom(plotly,add_text)
importFrom(plotly,add_trace)
importFrom(plotly,config)
importFrom(plotly,layout)
importFrom(plotly,plot_ly)
importFrom(raster,aggregate)
importFrom(rgeos,gDistance)
importFrom(shiny,runApp)
importFrom(stats,as.formula)
importFrom(stats,density)
importFrom(stats,lm)
importFrom(stats,predict)
importFrom(stats,quantile)
importFrom(utils,capture.output)
importFrom(utils,object.size)
# Generated by roxygen2: do not edit by hand

S3method(plot,antaresData)
S3method(plot,list)
S3method(plot,mapLayout)
S3method(plot,simOptions)
export(addShadows)
export(colorScaleOptions)
export(defaultTilesURL)
export(exchangesStack)
export(exchangesStackAliases)
export(getInteractivity)
export(leafletDragPointsOutput)
export(limitSizeGraph)
export(mapLayout)
export(modRpart)
export(modXY)
export(plotMap)
export(plotMapLayout)
export(plotMapOptions)
export(plotThermalGroupCapacities)
export(plotXY)
export(prodStack)
export(prodStackAliases)
export(prodStackExchangesLegend)
export(prodStackLegend)
export(renderLeafletDragPoints)
export(runAppAntaresViz)
export(savePlotAsPng)
export(setExchangesStackAlias)
export(setInteractivity)
export(setProdStackAlias)
export(stackMap)
export(tsLegend)
export(tsPlot)
import(antaresProcessing)
import(antaresRead)
import(assertthat)
import(data.table)
import(dygraphs)
import(htmltools)
import(leaflet)
import(leaflet.minicharts)
import(manipulateWidget)
import(rAmCharts)
import(sf)
import(shiny)
import(sp)
import(spMaps)
importFrom(geojsonio,geojson_json)
importFrom(grDevices,col2rgb)
importFrom(grDevices,colorRampPalette)
importFrom(grDevices,colors)
importFrom(grDevices,gray)
importFrom(grDevices,rainbow)
importFrom(grDevices,rgb)
importFrom(graphics,par)
importFrom(graphics,plot.default)
importFrom(methods,is)
importFrom(plotly,add_bars)
importFrom(plotly,add_heatmap)
importFrom(plotly,add_text)
importFrom(plotly,add_trace)
importFrom(plotly,config)
importFrom(plotly,layout)
importFrom(plotly,plot_ly)
importFrom(shiny,runApp)
importFrom(stats,as.formula)
importFrom(stats,density)
importFrom(stats,lm)
importFrom(stats,predict)
importFrom(stats,quantile)
importFrom(utils,capture.output)
importFrom(utils,object.size)
6 changes: 5 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
Copyright © 2016 RTE Réseau de transport d’électricité
Copyright 2016 RTE Reseau de transport d'electricite

# antaresViz 0.18.0
* fix deprecated dependencies (issue #200)
* packages `rgeos`, `raster` removed and replaced by `sf`

# antaresViz 0.17.1

Expand Down
Loading

0 comments on commit 60a94f8

Please sign in to comment.