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.

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

update roxygen #166

Merged
merged 7 commits into from
Sep 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ jobs:

- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: any::rcmdcheck
# needs local::. for install_altair()
extra-packages: any::rcmdcheck, local::.
needs: check

# start local mods
Expand Down
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Package: altair
Version: 4.2.2.9001
Version: 4.2.2.9002
Title: Interface to 'Altair'
Description: Interface to 'Altair' <https://altair-viz.github.io>, which itself
is a 'Python' interface to 'Vega-Lite' <https://vega.github.io/vega-lite/>.
Expand Down
2 changes: 2 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# altair (development version)

* Update package-documentation to comport with Roxygen updates. (#165)

* Update actions - note that for Altair 4.2.0, you must use Pandas<=1.5.3 (#163)

# altair 4.2.2
Expand Down
5 changes: 2 additions & 3 deletions R/altair-package.R
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,5 @@
#' [Altair Python package](https://altair-viz.github.io/index.html),
#' [Vega-Lite](https://vega.github.io/vega-lite/)
#'
#' @docType package
#' @name altair
NULL
#' @keywords internal
"_PACKAGE"
2 changes: 1 addition & 1 deletion R/install.R
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ install_altair <- function(method = c("conda", "virtualenv"),
# TODO: patch until we can use Altair 5
pandas_pkg_version <- paste("pandas", "1.5.3", sep = version_sep)

packages <- c(altair_pkg_version, "vega_datasets", pandas_pkg_version)
packages <- c(pandas_pkg_version, altair_pkg_version, "vega_datasets")

reticulate::py_install(
packages = packages,
Expand Down
2 changes: 1 addition & 1 deletion man/alt.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 20 additions & 1 deletion man/altair.Rd → man/altair-package.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.