Skip to content

Commit

Permalink
Merge pull request #49 from EvolEcolGroup/chelsa
Browse files Browse the repository at this point in the history
Chelsa
  • Loading branch information
dramanica authored Jun 18, 2024
2 parents 49204bd + 6d295fb commit 3ddcf19
Show file tree
Hide file tree
Showing 103 changed files with 16,108 additions and 13,221 deletions.
233 changes: 0 additions & 233 deletions .circleci/config.yml

This file was deleted.

10 changes: 5 additions & 5 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
branches: [master, dev, cran_submission]
branches: [master, dev]
pull_request:
branches: [master, dev]

Expand Down Expand Up @@ -44,10 +44,10 @@ jobs:
extra-packages: any::rcmdcheck
needs: check

- name: Get dev terra for dev pastclim
if: matrix.config.os == 'macos-latest' || ${{ github.base_ref == 'dev' }} || ${{ github.ref_name == 'dev' }}
run: install.packages('terra', repos='https://rspatial.r-universe.dev')
shell: Rscript {0}
# - name: Get dev terra for dev pastclim
# if: matrix.config.os == 'macos-latest' || ${{ github.base_ref == 'dev' }} || ${{ github.ref_name == 'dev' }}
# run: install.packages('terra', repos='https://rspatial.r-universe.dev')
# shell: Rscript {0}

- uses: r-lib/actions/check-r-package@v2
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pkgdown.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
on:
push:
branches: [master, dev]
pull_request:
branches: [master, dev]
# pull_request:
# branches: [master, dev]
release:
types: [published]
workflow_dispatch:
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/test-coverage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
branches: [main, master, dev]
pull_request:
branches: [main, master, dev]
branches: [main, master]

name: test-coverage

Expand Down
18 changes: 10 additions & 8 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: pastclim
Type: Package
Title: Manipulate Time Series of Palaeoclimate Reconstructions
Version: 2.0.0.9001
Version: 2.0.0.9003
Authors@R: c(
person("Michela", "Leonardi", role = "aut"),
person(c("Emily","Y."), "Hallet", role = "ctb"),
Expand All @@ -22,7 +22,7 @@ BugReports: https://github.com/EvolEcolGroup/pastclim/issues
Encoding: UTF-8
LazyData: true
LazyDataCompression: xz
RoxygenNote: 7.2.3
RoxygenNote: 7.3.0
Roxygen: list(markdown = TRUE)
Depends:
R (>= 4.0.0),
Expand All @@ -32,13 +32,15 @@ Imports:
lubridate,
methods,
ncdf4,
utils
utils,
xml2,
sf
Suggests:
rmarkdown,
knitr,
ggplot2,
sf,
testthat (>= 3.0.0),
spelling
httr,
knitr,
rmarkdown,
spelling,
testthat (>= 3.0.0)
VignetteBuilder: knitr
Config/testthat/edition: 3
4 changes: 4 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
# development version
* Add all CHELSA present and future datasets (including the use of virtual rasters to avoid downloading all data)
* Add paleoclim at multiple resolutions
* Add CHELSA-TraCE21k (including the use of virtual rasters to avoid downloading all data)
* Re-implement the import for WorldClim datasets to avoid repackaging the data (it should lead to faster downloads, but it will force a re-download if the dataset was already present).
* Add functions for Koeppen Geiger's classification from monthly means.

# pastclim 2.0.0
Expand Down
Loading

0 comments on commit 3ddcf19

Please sign in to comment.