Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ggplot2 version of the z-curve plot #14

Merged
merged 6 commits into from
Oct 30, 2023
Merged

ggplot2 version of the z-curve plot #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
485ca77
ggplot2
FBartos Jan 13, 2023
6dd0cf5
update documentation
FBartos Oct 25, 2023
ce00771
update workflow
FBartos Oct 25, 2023
db91d01
update actions
FBartos Oct 27, 2023
574cf3c
Update R-CMD-check.yaml
FBartos Oct 27, 2023
fb3fc3c
Revert "Update R-CMD-check.yaml"
FBartos Oct 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions .github/workflows/R-CMD-check.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,11 @@ on:
- main
- master
- pre-release
- censored
pull_request:
branches:
- main
- master
- pre-release
- censored

name: R-CMD-check

Expand All @@ -28,21 +26,21 @@ jobs:
config:
- {os: windows-latest, r: 'release'}
- {os: macOS-latest, r: 'release'}
- {os: ubuntu-20.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
- {os: ubuntu-latest, r: 'release'}

env:
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
RSPM: ${{ matrix.config.rspm }}
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- uses: r-lib/actions/setup-r@v1
- uses: r-lib/actions/setup-r@v2
with:
r-version: ${{ matrix.config.r }}

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

- name: Query dependencies
run: |
Expand All @@ -64,8 +62,7 @@ jobs:
while read -r cmd
do
eval sudo $cmd
apt-get install libcurl4-openssl-dev
done < <(Rscript -e 'writeLines(remotes::system_requirements("ubuntu", "20.04"))')
sudo apt-get install libcurl4-openssl-dev

- name: Install dependencies
run: |
Expand All @@ -90,7 +87,6 @@ jobs:
if: runner.os == 'Windows'
env:
_R_CHECK_CRAN_INCOMING_REMOTE_: false
JAGS_ROOT: "/c/progra~1/JAGS/JAGS-4.2.0"
run: |
options(crayon.enabled = TRUE)
rcmdcheck::rcmdcheck(
Expand Down
11 changes: 4 additions & 7 deletions .github/workflows/R-CMD-tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,11 @@ on:
- main
- master
- pre-release
- censored
pull_request:
branches:
- main
- master
- pre-release
- censored

name: R-CMD-tests

Expand All @@ -28,21 +26,21 @@ jobs:
config:
- {os: windows-latest, r: 'release'}
- {os: macOS-latest, r: 'release'}
- {os: ubuntu-20.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
- {os: ubuntu-latest, r: 'release'}

env:
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
RSPM: ${{ matrix.config.rspm }}
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- uses: r-lib/actions/setup-r@v1
- uses: r-lib/actions/setup-r@v2
with:
r-version: ${{ matrix.config.r }}

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

- name: Query dependencies
run: |
Expand All @@ -64,7 +62,6 @@ jobs:
while read -r cmd
do
eval sudo $cmd
done < <(Rscript -e 'writeLines(remotes::system_requirements("ubuntu", "20.04"))')


- name: Install and test z-curve (non-Windows)
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pkgdown.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ jobs:
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

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

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

- name: Query dependencies
run: |
Expand Down
8 changes: 5 additions & 3 deletions DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: zcurve
Title: An Implementation of Z-Curves
Version: 2.3.0
Version: 2.4.0
Authors@R: c(
person("František", "Bartoš", email = "[email protected]", role = c("aut", "cre")),
person("Ulrich", "Schimmack", email = "[email protected]", role = c("aut")))
Expand All @@ -17,14 +17,16 @@ License: GPL-3
Encoding: UTF-8
LazyData: true
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.2.1
RoxygenNote: 7.2.3
Imports:
Rcpp (>= 1.0.2),
nleqslv,
stats,
evmix,
graphics,
Rdpack
ggplot2,
Rdpack,
rlang
LinkingTo: Rcpp
Suggests:
parallel,
Expand Down
1 change: 1 addition & 0 deletions NAMESPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,6 @@ export(zcurve_clustered)
export(zcurve_data)
importFrom(Rcpp,sourceCpp)
importFrom(Rdpack,reprompt)
importFrom(rlang,.data)
importFrom(utils,head)
useDynLib(zcurve, .registration = TRUE)
3 changes: 3 additions & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
## version 2.4.0
- Implementation of ggploting function.

## version 2.3.0
- Implementation of parallel bootstrap.

Expand Down
Loading
Loading