Skip to content

Commit

Permalink
Hard cleaning of commit tree
Browse files Browse the repository at this point in the history
breaking stufffff

Removing some credentials and spring-cleaning
  • Loading branch information
lfagliano committed May 14, 2024
1 parent f2fa15d commit 004ff29
Show file tree
Hide file tree
Showing 87 changed files with 4,904 additions and 224 deletions.
20 changes: 20 additions & 0 deletions .Rbuildignore
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,2 +1,22 @@
^.*\.Rproj$
^\.Rproj\.user$
^_pkgdown\.yml$
^docs$
^pkgdown$
^pkgdown/$
^doc$
^Meta$
^\.github$
^codecov\.yml$
^vignettes/articles$
^LICENSE\.md$
^README.Rmd
^test.R
^.trackdown
^trackdown_uploads.R
.covrignore
acled_analysis.Rmd
acled_generate_counts.R
acled_generate_movers.R
acled_report_api.R
acled_actor_concentration.R
5 changes: 5 additions & 0 deletions .covrignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
R/acled_help.R
R/acled_generate_counts.R
R/acled_generate_movers.R
R/acled_actor_concentration.R
R/acled_report_api.R
1 change: 1 addition & 0 deletions .github/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.html
51 changes: 51 additions & 0 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# 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 }}
EMAIL_ADDRESS_EXAMPLES: ${{ secrets.EMAIL_ADDRESS_EXAMPLES}}
EXAMPLES_KEY: ${{ secrets.EXAMPLES_KEY}}
R_KEEP_PKG_SOURCE: yes

steps:
- uses: actions/checkout@v3

- 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
49 changes: 49 additions & 0 deletions .github/workflows/pkgdown.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]
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@v3

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

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

- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: any::pkgdown, local::.
needs: website

- name: load enviornment variables
run: |
echo "EMAIL_ADDRESS_EXAMPLES=${{ secrets.EMAIL_ADDRESS_EXAMPLES}}" >> .Renviron
echo "EXAMPLES_KEY=${{ secrets.EXAMPLES_KEY}}" >> .Renviron
- 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
52 changes: 52 additions & 0 deletions .github/workflows/test-coverage.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
# 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 }}
EMAIL_ADDRESS_EXAMPLES: ${{ secrets.EMAIL_ADDRESS_EXAMPLES}}
EXAMPLES_KEY: ${{ secrets.EXAMPLES_KEY}}

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
4 changes: 4 additions & 0 deletions .gitignore
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,7 @@
.Rhistory
.RData
.Ruserdata
.Rprofile
.RDataTmp
.Renviron
.DS_Store
67 changes: 57 additions & 10 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,20 +1,67 @@
Package: acledR
Type: Package
Title: Manipulate ACLED Data
Title: Manipulate 'ACLED' Data
Version: 0.1.0
Author: Trey Billing
Maintainer: Trey Billing <[email protected]>
Description: More about what it does (maybe more than one line)
Use four spaces when indenting paragraphs within the Description.
License: What license is it under?
Authors@R: c(
person(given = "Lucas",
family = "Fagliano",
role = "aut",
email = "[email protected]"),
person(given = "Trey",
family = "Billing",
role = "aut",
email = "[email protected]"),
person(given = "Rachel",
family = "Goodman",
role = "aut",
email = "[email protected]"),
person(given = "Katayoun",
family = "Kishi",
role = "aut",
email = "[email protected]"),
person(given = "Michael",
family = "Start",
role = "aut",
email = "[email protected]"),
person(given = "",
family = "ACLED",
role = c("cph", "cre"),
email ="[email protected]"))
Description: The package allows users to easily interact with 'ACLED' data by providing wrappers for the API and other functions to manipulate 'ACLED' data.
License: GPL (>= 3)
Encoding: UTF-8
LazyData: true
Imports:
dplyr,
methods,
httr,
lubridate,
stringr,
tidyr,
magrittr,
purrr,
slider,
tidyr
RoxygenNote: 7.1.1
rlang,
utils
RoxygenNote: 7.2.3
Depends:
R (>= 2.10)
R (>= 3.5.0)
URL: https://github.com/ACLED/acledR, https://acled.github.io/acledR/
BugReports: https://github.com/ACLED/acledR/issues
Suggests:
knitr,
janitor,
rmarkdown,
readr,
kableExtra,
ggplot2,
covr,
here,
secret,
sf,
raster,
forcats,
igraph,
sjmisc,
testthat (>= 3.0.0)
VignetteBuilder: knitr
Config/testthat/edition: 3
Loading

0 comments on commit 004ff29

Please sign in to comment.