Skip to content

Commit

Permalink
Merge branch 'main' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
christopherkenny authored Jan 14, 2024
2 parents 36d1db9 + 1c00630 commit 65ce7c2
Show file tree
Hide file tree
Showing 91 changed files with 5,458 additions and 2,749 deletions.
4 changes: 3 additions & 1 deletion .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,6 @@
^\.github$
^CRAN-RELEASE$
^cran-comments\.md$
man-roxygen
man-roxygen
^CRAN-SUBMISSION$
^data-raw$
88 changes: 0 additions & 88 deletions .github/workflows/R-CMD-check.yaml

This file was deleted.

49 changes: 49 additions & 0 deletions .github/workflows/check-standard.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
# 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: R-CMD-check

jobs:
R-CMD-check:
runs-on: ${{ matrix.config.os }}

name: ${{ matrix.config.os }} (${{ matrix.config.r }})

strategy:
fail-fast: false
matrix:
config:
- {os: macOS-latest, r: 'release'}
- {os: windows-latest, r: 'release'}
- {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
- {os: ubuntu-latest, r: 'release'}
- {os: ubuntu-latest, r: 'oldrel-1'}

env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
R_KEEP_PKG_SOURCE: yes

steps:
- uses: actions/checkout@v2

- uses: r-lib/actions/setup-pandoc@v2

- 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@v2
with:
extra-packages: any::rcmdcheck
needs: check

- uses: r-lib/actions/check-r-package@v2
with:
upload-snapshots: true
35 changes: 24 additions & 11 deletions .github/workflows/pkgdown.yaml
Original file line number Diff line number Diff line change
@@ -1,33 +1,46 @@
# Workflow derived from https://github.com/r-lib/actions/tree/master/examples
# 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]
tags: ['*']
pull_request:
branches: [main, master]
release:
types: [published]
workflow_dispatch:

name: pkgdown

jobs:
pkgdown:
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 }}
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
extra-packages: any::pkgdown, local::.
needs: website

- name: Deploy package
run: |
git config --local user.name "$GITHUB_ACTOR"
git config --local user.email "[email protected]"
Rscript -e 'pkgdown::deploy_to_branch(new_process = FALSE)'
- name: Build site
run: pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE)
shell: Rscript {0}

- name: Deploy to GitHub pages 🚀
if: github.event_name != 'pull_request'
uses: JamesIves/[email protected]
with:
clean: false
branch: gh-pages
folder: docs
2 changes: 0 additions & 2 deletions CRAN-RELEASE

This file was deleted.

3 changes: 3 additions & 0 deletions CRAN-SUBMISSION
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Version: 2.2.1
Date: 2023-04-16 14:17:28 UTC
SHA: c9002ccb21e9b6f9257c2b7d8b8baf356cf57c70
46 changes: 28 additions & 18 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,38 +1,48 @@
Package: geomander
Type: Package
Title: Geographic Tools for Studying Gerrymandering
Version: 2.0.2
Date: 2021-12-08
Authors@R: person("Christopher T.", "Kenny", email = "[email protected]",
role = c("aut", "cre"), comment = c(ORCID = "0000-0002-9386-6860"))
Description: A compilation of tools to complete common tasks for studying gerrymandering. This focuses on the geographic tool side of common problems, such as linking different levels of spatial units or estimating how to break up units. Functions exist for creating redistricting-focused data for the US.
Version: 2.2.1
Date: 2023-04-16
Authors@R: c(
person("Christopher T.", "Kenny", email = "[email protected]",
role = c("aut", "cre"), comment = c(ORCID = "0000-0002-9386-6860")),
person("Cory", "McCartan", email = "[email protected]",
role = "ctb", comment = c(ORCID = "0000-0002-6251-669X"))
)
Description: A compilation of tools to complete common tasks for studying gerrymandering.
This focuses on the geographic tool side of common problems, such as linking
different levels of spatial units or estimating how to break up units. Functions
exist for creating redistricting-focused data for the US.
License: MIT + file LICENCE
URL: https://www.christophertkenny.com/geomander/, https://github.com/christopherkenny/geomander
URL: https://christophertkenny.com/geomander/, https://github.com/christopherkenny/geomander
BugReports: https://github.com/christopherkenny/geomander/issues
RoxygenNote: 7.1.2
LinkingTo: Rcpp
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.2.3
LinkingTo: Rcpp (>= 1.0.7)
Imports:
censable,
cli,
dataverse,
dplyr,
geos,
ggplot2,
magrittr,
readr,
rlang,
Rcpp,
sf,
stringr,
tibble,
tidyr,
tigris (>= 1.5),
ggplot2,
readr,
dataverse,
censable,
Rcpp (>= 1.0.7),
geos,
cli
tinytiger
Depends:
R (>= 2.10)
R (>= 3.0.2)
Suggests:
redist,
knitr,
rmarkdown,
testthat (>= 3.0.0)
testthat (>= 3.0.0),
RcppSimdJson
LazyData: true
Encoding: UTF-8
VignetteBuilder: knitr
Expand Down
15 changes: 15 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@ export("%>%")
export(add_edge)
export(adjacency)
export(alarm_states)
export(baf_to_vtd)
export(block2prec)
export(block2prec_by_county)
export(ccm)
export(cct)
export(check_contiguity)
export(check_polygon_contiguity)
export(clean_vest)
Expand All @@ -25,24 +28,33 @@ export(geo_plot_group)
export(geo_sort)
export(geo_trim)
export(geos_centerish)
export(geos_circle_center)
export(get_alarm)
export(get_dra)
export(get_heda)
export(get_lewis)
export(get_rpvnearme)
export(get_vest)
export(global_gearys)
export(global_morans)
export(gstar_i)
export(heda_states)
export(local_gearys)
export(local_morans)
export(r2dra)
export(regionalize)
export(seam_adj)
export(seam_geom)
export(seam_rip)
export(seam_sew)
export(split_precinct)
export(st_centerish)
export(st_circle_center)
export(subtract_edge)
export(suggest_component_connection)
export(suggest_neighbors)
export(vest_states)
importFrom(Rcpp,evalCpp)
importFrom(dplyr,.data)
importFrom(dplyr,all_of)
importFrom(dplyr,any_of)
Expand Down Expand Up @@ -75,6 +87,9 @@ importFrom(ggplot2,theme_void)
importFrom(magrittr,"%>%")
importFrom(readr,read_csv)
importFrom(readr,write_csv)
importFrom(rlang,":=")
importFrom(rlang,.data)
importFrom(rlang,.env)
importFrom(sf,"st_geometry<-")
importFrom(stringr,str_detect)
importFrom(tibble,add_row)
Expand Down
22 changes: 22 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,25 @@
# geomander 2.2.1

* Adds support for downloading Jeffrey B. Lewis's historical congressional districts with `get_lewis()
* Adds support for downloading RPV Near Me datasets with `get_rpvnearme()`
* Corrects normalized global Moran's I calculation (#12), thanks @CoryMcCartan.

# geomander 2.2.0
* Updates dependencies for easier installation.
* Allows for use of `circle` as a method in `geo_match()`.
* Adds a `by` argument to `geo_match()` for subsetting to known matching regions.
* Uses `redist` in vignettes only conditionally.
* Massive improvements in performance for `check_contiguity()`.

# geomander 2.1.1
* Fixes missing tolerance bug in `geos_circle_center()`.
* Adds experimental regionalizion approach, `regionalize()`.

# geomander 2.1.0
* Avoid indirect download for `get_alarm()`. Fixes bug where block level data resulted in mismatched geometry.
* Add `st_circle_center()` and `geos_circle_center()` for centroid of the maximum inscribed circle.
* Add `baf_to_vtd()` function to approximate BAFs at the VTD level.

# geomander 2.0.2
* Drop `spdep` dependency to avoid timeouts on checking examples.

Expand Down
Loading

0 comments on commit 65ce7c2

Please sign in to comment.