-
Notifications
You must be signed in to change notification settings - Fork 15
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #34 from olivroy/site
Move to NEWS.md + use bootstrap 5 for pkgdown!
- Loading branch information
Showing
9 changed files
with
94 additions
and
155 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,4 +6,4 @@ | |
| ^_pkgdown\.yml$ | ||
| ^docs$ | ||
| ^pkgdown$ | ||
| ^.github | ||
| ^\.github$ | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| *.html |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,48 +1,48 @@ | ||
| # 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 | ||
| branches: [main, master] | ||
| pull_request: | ||
| branches: [main, master] | ||
| release: | ||
| types: [published] | ||
| workflow_dispatch: | ||
|
|
||
| name: pkgdown | ||
|
|
||
| jobs: | ||
| pkgdown: | ||
| runs-on: macOS-latest | ||
| runs-on: ubuntu-latest | ||
| # Only restrict concurrency for non-PR jobs | ||
| concurrency: | ||
| group: pkgdown-${{ github.event_name != 'pull_request' || github.run_id }} | ||
| env: | ||
| GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} | ||
| permissions: | ||
| contents: write | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
|
|
||
| - uses: r-lib/actions/setup-r@v2 | ||
|
|
||
| - uses: r-lib/actions/setup-pandoc@v2 | ||
|
|
||
| - name: Query dependencies | ||
| run: | | ||
| install.packages('remotes') | ||
| saveRDS(remotes::dev_package_deps(dependencies = TRUE), ".github/depends.Rds", version = 2) | ||
| writeLines(sprintf("R-%i.%i", getRversion()$major, getRversion()$minor), ".github/R-version") | ||
| shell: Rscript {0} | ||
| - uses: r-lib/actions/setup-r@v2 | ||
| with: | ||
| use-public-rspm: true | ||
|
|
||
| - name: Restore R package cache | ||
| uses: actions/cache@v2 | ||
| - uses: r-lib/actions/setup-r-dependencies@v2 | ||
| with: | ||
| path: ${{ env.R_LIBS_USER }} | ||
| key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }} | ||
| restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1- | ||
| extra-packages: any::pkgdown, local::. | ||
| needs: website | ||
|
|
||
| - name: Install dependencies | ||
| run: | | ||
| remotes::install_deps(dependencies = TRUE) | ||
| install.packages("pkgdown", type = "binary") | ||
| - name: Build site | ||
| run: pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE) | ||
| shell: Rscript {0} | ||
|
|
||
| - name: Install package | ||
| run: R CMD INSTALL . | ||
|
|
||
| - name: Deploy package | ||
| run: | | ||
| git config --local user.email "[email protected]" | ||
| git config --local user.name "GitHub Actions" | ||
| Rscript -e 'pkgdown::deploy_to_branch(new_process = FALSE)' | ||
| - name: Deploy to GitHub pages 🚀 | ||
| if: github.event_name != 'pull_request' | ||
| uses: JamesIves/[email protected] | ||
| with: | ||
| clean: false | ||
| branch: gh-pages | ||
| folder: docs |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| # cartogram 0.3.0 | ||
|
|
||
| * Remove sp, rgdal and maptools from examples and suggestions. | ||
|
|
||
| * `cartogram_cont()` has a new parameter `verbose = FALSE` to hide print of size error on each iteration. | ||
|
|
||
| # cartogram 0.2.2 | ||
|
|
||
| * Fix geometry replacement in cartogram_ncont | ||
|
|
||
| # cartogram 0.2.0 | ||
|
|
||
| * Migrated all functions to sf, fixed problems with multipolygons. | ||
| * cartogram functions won't accept features with longitude/latitude coordinates anymore. | ||
|
|
||
| # cartogram 0.1.1 | ||
|
|
||
| * Update sf code. Thanks to @Nowosad for speeding things up! | ||
|
|
||
| # cartogram 0.1.0 | ||
|
|
||
| * Non-Overlapping Circles Cartogram (Dorling) | ||
|
|
||
| # cartogram 0.0.3 | ||
|
|
||
| * sf support added | ||
|
|
||
| # cartogram 0.0.2 | ||
|
|
||
| * Non-contiguous Area Cartogram | ||
| * Prepare data with missing or extreme values before cartogram calculation for faster convergence | ||
|
|
||
| # cartogram 0.0.1 | ||
|
|
||
| * Initial Release |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| url: ~ | ||
| template: | ||
| bootstrap: 5 | ||
|
|