diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml index 56332955..ed654130 100644 --- a/.github/workflows/pkgdown.yaml +++ b/.github/workflows/pkgdown.yaml @@ -14,7 +14,7 @@ jobs: env: GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: r-lib/actions/setup-r@v2 @@ -32,7 +32,7 @@ jobs: shell: Rscript {0} - name: Restore R package cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ env.R_LIBS_USER }} key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }} diff --git a/.github/workflows/test-build.yaml b/.github/workflows/test-build.yaml index f9c71393..19f14876 100644 --- a/.github/workflows/test-build.yaml +++ b/.github/workflows/test-build.yaml @@ -3,9 +3,6 @@ on: branches: - '*' workflow_dispatch: -# pull_request: -# branches: -# - master jobs: R-CMD-check: @@ -17,14 +14,14 @@ jobs: fail-fast: false matrix: config: -# - {os: windows-latest, r: 'release'} -# - {os: macOS-latest, r: 'release'} + - {os: windows-latest, r: 'release'} + - {os: macOS-latest, r: 'release'} - {os: ubuntu-latest, r: 'release'} env: GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: r-lib/actions/setup-pandoc@v2 - uses: r-lib/actions/setup-r@v2 with: @@ -37,14 +34,11 @@ jobs: rcmdcheck remotes - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: - python-version: '3.9' - architecture: 'x64' - - name: Install local registry - run: curl -fsSL https://data.scrc.uk/static/localregistry.sh | /bin/bash -s -- -b main + python-version: '3.12' - name: Checkout FAIRDataPipeline/FAIR-CLI - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: FAIRDataPipeline/FAIR-CLI path: FAIR-CLI @@ -60,25 +54,25 @@ jobs: run: | cd ../FAIR-CLI poetry install - source .venv/bin/activate - cd ${{ github.workspace }} + source $VENV + cd '${{ github.workspace }}' + fair registry install --version main fair init --ci fair registry start + shell: bash + + - name: Copy token on windows + run: | + mkdir -p C:/Users/runneradmin/Documents/.fair/registry/ + cp C:/Users/runneradmin/.fair/registry/token C:/Users/runneradmin/Documents/.fair/registry/token + shell: bash + if: runner.os == 'Windows' - name: Install R API system requirements (macOS-latest) if: runner.os == 'macOS' run : | - rm '/usr/local/bin/gfortran' brew install hdf5 brew install gdal - - name: Install R API system requirements (ubuntu-20.04) - if: matrix.config.os == 'ubuntu-20.04' - run: | - while read -r cmd - do - eval sudo $cmd - done < <(Rscript -e 'cat(remotes::system_requirements("ubuntu", "20.04"), sep = "\n")') - - name: Check env: _R_CHECK_CRAN_INCOMING_: false @@ -88,12 +82,14 @@ jobs: rcmdcheck::rcmdcheck(args = c("--no-manual", "--as-cran"), error_on = "warning", check_dir = "check") shell: Rscript {0} - name: Show testthat output - if: always() + if: ${{ !cancelled() }} run: find check -name 'testthat.Rout*' -exec cat '{}' \; || true shell: bash - name: Upload check results - if: failure() - uses: actions/upload-artifact@main + if: ${{ failure() }} + uses: actions/upload-artifact@v4 with: name: ${{ runner.os }}-r${{ matrix.config.r }}-results path: check + overwrite: true + include-hidden-files: true diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml index 514eef2b..ebb0a3ef 100644 --- a/.github/workflows/test-coverage.yaml +++ b/.github/workflows/test-coverage.yaml @@ -59,7 +59,7 @@ jobs: rDataPipeline::fair_init( name = "Sonia Mitchell", identifier = "https://orcid.org/0000-0003-1536-2066", - endpoint = "http://localhost:8000/api/") + endpoint = "http://127.0.0.1:8000/api/") shell: Rscript {0} - name: Test coverage env: diff --git a/DESCRIPTION b/DESCRIPTION index 279871c6..93f84c98 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: rDataPipeline Title: Functions to Interact with the 'FAIR Data Pipeline' -Version: 0.6.0 -Authors@R: c(person("Sonia", "Mitchell", email = "sonia.mitchell@glasgow.ac.uk", +Version: 0.60.0 +Authors@R: c(person("Sonia", "Mitchell", role = c("aut"), comment = c(ORCID = "0000-0003-1536-2066")), person("Ryan", "Field", email = "ryan.field@glasgow.ac.uk", role = c("cre", "aut"), comment = c(ORCID = "0000-0002-4424-9890"))) diff --git a/NEWS.md b/NEWS.md index 78f25321..a46a24db 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,7 +1,7 @@ # NEWS -# rDataPipeline v0.6.0 +# rDataPipeline v0.60.0 ## Improvements: - Updates to work with latest versions of R + Updates to work with latest version of data registry - v0.54.1 - Initial release - v0.54.2 diff --git a/R/check_dataproduct_exists.R b/R/check_dataproduct_exists.R index f4f7fcba..696ff132 100644 --- a/R/check_dataproduct_exists.R +++ b/R/check_dataproduct_exists.R @@ -21,7 +21,7 @@ check_dataproduct_exists <- function(write_dataproduct, namespace = write_namespace_id), endpoint = endpoint) - write_namespace_url <- file.path("http://localhost:8000", "api", + write_namespace_url <- file.path("http://127.0.0.1:8000", "api", "namespace", write_namespace_id) write_namespace <- get_entity(write_namespace_url)$name diff --git a/R/check_exists.R b/R/check_exists.R index 3ace9e98..94da5196 100644 --- a/R/check_exists.R +++ b/R/check_exists.R @@ -14,7 +14,7 @@ check_exists <- function(table, query) { - output <- httr::GET(paste0("http://localhost:8000/api/", table, ""), + output <- httr::GET(paste0("http://127.0.0.1:8000/api/", table, ""), query = query) if (any(names(output) == "status_code")) { diff --git a/R/create_config.R b/R/create_config.R index 24428804..a1cb93dc 100644 --- a/R/create_config.R +++ b/R/create_config.R @@ -33,7 +33,7 @@ create_config <- function(path, # Generate run_metadata block run_metadata <- list(description = description, - local_data_registry_url = "http://localhost:8000/api/", + local_data_registry_url = "http://127.0.0.1:8000/api/", remote_data_registry_url = "https://data.scrc.uk/api/", default_input_namespace = input_namespace, default_output_namespace = output_namespace, diff --git a/R/fair_init.R b/R/fair_init.R index 49ba7037..1666bff4 100644 --- a/R/fair_init.R +++ b/R/fair_init.R @@ -11,7 +11,7 @@ #' fair_init <- function(name, identifier, - endpoint = "http://localhost:8000/api/") { + endpoint = "http://127.0.0.1:8000/api/") { user_url <- get_url(table = "users", query = list(username = "admin"), diff --git a/R/fair_run.R b/R/fair_run.R index 0ad72493..3be69ccb 100644 --- a/R/fair_run.R +++ b/R/fair_run.R @@ -7,7 +7,7 @@ #' @export #' fair_run <- function(path = "config.yaml", - endpoint = "http://localhost:8000/api/", + endpoint = "http://127.0.0.1:8000/api/", skip = FALSE) { # Save names in data store diff --git a/R/get_dataproduct.R b/R/get_dataproduct.R index 9c506f45..669f6340 100644 --- a/R/get_dataproduct.R +++ b/R/get_dataproduct.R @@ -10,7 +10,7 @@ get_dataproduct <- function(data_product, version, namespace, - endpoint = "http://localhost:8000/api/") { + endpoint = "http://127.0.0.1:8000/api/") { # Get provenance URL namespace_entry <- get_entry("namespace", list(name = namespace), diff --git a/R/get_entity.R b/R/get_entity.R index 70b5be6a..b6e4f061 100644 --- a/R/get_entity.R +++ b/R/get_entity.R @@ -11,7 +11,7 @@ get_entity <- function(url) { # Sometimes an error is returned from the local registry: # "Error in curl::curl_fetch_memory(url, handle = handle) : - # Failed to connect to localhost port 8000: Connection refused" + # Failed to connect to 127.0.0.1:8000 port 8000: Connection refused" # Repeating the action works eventually... continue <- TRUE while (continue) { diff --git a/R/get_entry.R b/R/get_entry.R index e1b480fd..bf6e56e3 100644 --- a/R/get_entry.R +++ b/R/get_entry.R @@ -10,7 +10,7 @@ #' @export #' @family get functions #' -get_entry <- function(table, query, endpoint = "http://localhost:8000/api/") { +get_entry <- function(table, query, endpoint = "http://127.0.0.1:8000/api/") { key <- get_token() h <- c(Authorization = paste("token", key)) diff --git a/R/get_existing.R b/R/get_existing.R index 9226455e..539f57a0 100644 --- a/R/get_existing.R +++ b/R/get_existing.R @@ -19,7 +19,7 @@ get_existing <- function(table, limit_results = TRUE, detail = "all", - endpoint = "http://localhost:8000/api/") { + endpoint = "http://127.0.0.1:8000/api/") { if (!check_table_exists(table)) usethis::ui_stop(paste( diff --git a/R/get_fields.R b/R/get_fields.R index dff0de3a..a4a1f88a 100644 --- a/R/get_fields.R +++ b/R/get_fields.R @@ -10,7 +10,7 @@ #' @return Returns a \code{data.frame} of fields and their attributes set to #' "none" #' -get_fields <- function(table, endpoint = "http://localhost:8000/api/") { +get_fields <- function(table, endpoint = "http://127.0.0.1:8000/api/") { # Add token to options request header key <- get_token() diff --git a/R/get_id.R b/R/get_id.R index 354734dd..e5859ca7 100644 --- a/R/get_id.R +++ b/R/get_id.R @@ -14,7 +14,7 @@ #' get_id <- function(table, query = list(), - endpoint = "http://localhost:8000/api/") { + endpoint = "http://127.0.0.1:8000/api/") { output <- get_entry(table, query, endpoint) diff --git a/R/get_tables.R b/R/get_tables.R index b125dd1a..4b6b625a 100644 --- a/R/get_tables.R +++ b/R/get_tables.R @@ -6,7 +6,7 @@ #' @return a character vector of tables #' @keywords internal #' -get_tables <- function(endpoint = "http://localhost:8000/api/") { +get_tables <- function(endpoint = "http://127.0.0.1:8000/api/") { httr::GET(endpoint) %>% httr::content(as = "text", encoding = "UTF-8") %>% diff --git a/R/get_url.R b/R/get_url.R index 7a2b9997..e9e8a42a 100644 --- a/R/get_url.R +++ b/R/get_url.R @@ -14,7 +14,7 @@ #' get_url <- function(table, query = list(), - endpoint = "http://localhost:8000/api/") { + endpoint = "http://127.0.0.1:8000/api/") { output <- get_entry(table = table, query = query, diff --git a/R/new_author.R b/R/new_author.R index 842f4e3b..4c65ca57 100644 --- a/R/new_author.R +++ b/R/new_author.R @@ -15,7 +15,7 @@ #' new_author <- function(name, identifier, - endpoint = "http://localhost:8000/api/") { + endpoint = "http://127.0.0.1:8000/api/") { data <- list() diff --git a/R/new_code_repo_release.R b/R/new_code_repo_release.R index bfaf55e5..011e51cd 100644 --- a/R/new_code_repo_release.R +++ b/R/new_code_repo_release.R @@ -19,7 +19,7 @@ new_code_repo_release <- function(name, version, object_url, website, - endpoint = "http://localhost:8000/api/") { + endpoint = "http://127.0.0.1:8000/api/") { data <- list(name = name, version = version, diff --git a/R/new_code_run.R b/R/new_code_run.R index c36226e4..1e463899 100644 --- a/R/new_code_run.R +++ b/R/new_code_run.R @@ -31,7 +31,7 @@ new_code_run <- function(run_date, submission_script_url, inputs_urls = list(), outputs_urls = list(), - endpoint = "http://localhost:8000/api/") { + endpoint = "http://127.0.0.1:8000/api/") { data <- list(run_date = run_date, inputs = inputs_urls, diff --git a/R/new_data_product.R b/R/new_data_product.R index 831d96f5..010b8b95 100644 --- a/R/new_data_product.R +++ b/R/new_data_product.R @@ -19,7 +19,7 @@ new_data_product <- function(name, version, object_url, namespace_url, - endpoint = "http://localhost:8000/api/") { + endpoint = "http://127.0.0.1:8000/api/") { post_data(table = "data_product", data = list(name = name, diff --git a/R/new_external_object.R b/R/new_external_object.R index 665a3ffa..d251b9ac 100644 --- a/R/new_external_object.R +++ b/R/new_external_object.R @@ -30,7 +30,7 @@ new_external_object <- function(doi_or_unique_name, description, data_product_url, original_store_url, - endpoint = "http://localhost:8000/api/") { + endpoint = "http://127.0.0.1:8000/api/") { data <- list(doi_or_unique_name = doi_or_unique_name, release_date = release_date, diff --git a/R/new_file_type.R b/R/new_file_type.R index bd3b2e96..885d5123 100644 --- a/R/new_file_type.R +++ b/R/new_file_type.R @@ -12,7 +12,7 @@ #' new_file_type <- function(name, extension, - endpoint = "http://localhost:8000/api/") { + endpoint = "http://127.0.0.1:8000/api/") { post_data(table = "file_type", data = list(name = name, diff --git a/R/new_issue.R b/R/new_issue.R index 68478b01..7fa54fd7 100644 --- a/R/new_issue.R +++ b/R/new_issue.R @@ -16,7 +16,7 @@ new_issue <- function(severity, description, component_issues, - endpoint = "http://localhost:8000/api/") { + endpoint = "http://127.0.0.1:8000/api/") { post_data(table = "issue", data = list(severity = severity, diff --git a/R/new_keyword.R b/R/new_keyword.R index 884ef6e2..d8b87927 100644 --- a/R/new_keyword.R +++ b/R/new_keyword.R @@ -16,7 +16,7 @@ new_keyword <- function(object_url, keyphrase, identifier, - endpoint = "http://localhost:8000/api/") { + endpoint = "http://127.0.0.1:8000/api/") { data <- list(object = object_url, keyphrase = keyphrase) diff --git a/R/new_licence.R b/R/new_licence.R index bb003794..11006fe6 100644 --- a/R/new_licence.R +++ b/R/new_licence.R @@ -13,7 +13,7 @@ #' new_licence <- function(object_url, licence_info, - endpoint = "http://localhost:8000/api/") { + endpoint = "http://127.0.0.1:8000/api/") { post_data(table = "licence", data = list(object = object_url, diff --git a/R/new_namespace.R b/R/new_namespace.R index aacf7284..a15a267f 100644 --- a/R/new_namespace.R +++ b/R/new_namespace.R @@ -16,7 +16,7 @@ new_namespace <- function(name, full_name, website, - endpoint = "http://localhost:8000/api/") { + endpoint = "http://127.0.0.1:8000/api/") { data <- list(name = name) diff --git a/R/new_object.R b/R/new_object.R index 9b1bdfcc..4cbe6c6a 100644 --- a/R/new_object.R +++ b/R/new_object.R @@ -20,7 +20,7 @@ new_object <- function(description, storage_location_url, authors_url, file_type_url, - endpoint = "http://localhost:8000/api/") { + endpoint = "http://127.0.0.1:8000/api/") { data <- list() diff --git a/R/new_object_component.R b/R/new_object_component.R index 28a9eed4..08f9da7f 100644 --- a/R/new_object_component.R +++ b/R/new_object_component.R @@ -30,7 +30,7 @@ new_object_component <- function(object_url, description, whole_object = FALSE, issues_urls, - endpoint = "http://localhost:8000/api/") { + endpoint = "http://127.0.0.1:8000/api/") { data <- list(object = object_url, name = name, diff --git a/R/new_quality_controlled.R b/R/new_quality_controlled.R index 2b5935e2..38eab741 100644 --- a/R/new_quality_controlled.R +++ b/R/new_quality_controlled.R @@ -11,7 +11,7 @@ #' @family new functions #' new_quality_controlled <- function(object_url, - endpoint = "http://localhost:8000/api/") { + endpoint = "http://127.0.0.1:8000/api/") { post_data(table = "quality_controlled", data = list(object = object_url), diff --git a/R/new_storage_location.R b/R/new_storage_location.R index bac6080b..4ff75e14 100644 --- a/R/new_storage_location.R +++ b/R/new_storage_location.R @@ -21,7 +21,7 @@ new_storage_location <- function(path, hash, public, storage_root_url, - endpoint = "http://localhost:8000/api/") { + endpoint = "http://127.0.0.1:8000/api/") { data <- list(path = path, hash = hash, storage_root = storage_root_url) diff --git a/R/new_storage_root.R b/R/new_storage_root.R index a07977ec..76619210 100644 --- a/R/new_storage_root.R +++ b/R/new_storage_root.R @@ -15,7 +15,7 @@ #' new_storage_root <- function(root, local, - endpoint = "http://localhost:8000/api/") { + endpoint = "http://127.0.0.1:8000/api/") { data <- list(root = root) diff --git a/R/new_user_author.R b/R/new_user_author.R index 3b4de05a..ce81dfd2 100644 --- a/R/new_user_author.R +++ b/R/new_user_author.R @@ -14,7 +14,7 @@ #' new_user_author <- function(user_url, author_url, - endpoint = "http://localhost:8000/api/") { + endpoint = "http://127.0.0.1:8000/api/") { data <- list(user = user_url, author = author_url) diff --git a/R/post_data.R b/R/post_data.R index d7b25578..af432d56 100644 --- a/R/post_data.R +++ b/R/post_data.R @@ -22,7 +22,7 @@ post_data <- function(table, data, endpoint) { # Sometimes an error is returned from the local registry: # "Error in curl::curl_fetch_memory(url, handle = handle) : - # Failed to connect to localhost port 8000: Connection refused" + # Failed to connect to 127.0.0.1 port 8000: Connection refused" # Repeating the action works eventually... continue <- TRUE while (continue) { diff --git a/man/fair_init.Rd b/man/fair_init.Rd index dd1c9b8e..c7ea660b 100644 --- a/man/fair_init.Rd +++ b/man/fair_init.Rd @@ -4,7 +4,7 @@ \alias{fair_init} \title{fair_init} \usage{ -fair_init(name, identifier, endpoint = "http://localhost:8000/api/") +fair_init(name, identifier, endpoint = "http://127.0.0.1:8000/api/") } \arguments{ \item{name}{a \code{string} specifying the full name or organisation name of diff --git a/man/fair_run.Rd b/man/fair_run.Rd index 7ad5e9ed..fa8b6464 100644 --- a/man/fair_run.Rd +++ b/man/fair_run.Rd @@ -6,7 +6,7 @@ \usage{ fair_run( path = "config.yaml", - endpoint = "http://localhost:8000/api/", + endpoint = "http://127.0.0.1:8000/api/", skip = FALSE ) } diff --git a/man/get_dataproduct.Rd b/man/get_dataproduct.Rd index e6e9495b..e242024d 100644 --- a/man/get_dataproduct.Rd +++ b/man/get_dataproduct.Rd @@ -8,7 +8,7 @@ get_dataproduct( data_product, version, namespace, - endpoint = "http://localhost:8000/api/" + endpoint = "http://127.0.0.1:8000/api/" ) } \arguments{ diff --git a/man/get_entry.Rd b/man/get_entry.Rd index fac8306e..d6491167 100644 --- a/man/get_entry.Rd +++ b/man/get_entry.Rd @@ -4,7 +4,7 @@ \alias{get_entry} \title{Return all fields associated with a table entry in the data registry} \usage{ -get_entry(table, query, endpoint = "http://localhost:8000/api/") +get_entry(table, query, endpoint = "http://127.0.0.1:8000/api/") } \arguments{ \item{table}{a \code{string} specifying the name of the table} diff --git a/man/get_existing.Rd b/man/get_existing.Rd index 3996fc6d..d5fcea67 100644 --- a/man/get_existing.Rd +++ b/man/get_existing.Rd @@ -8,7 +8,7 @@ get_existing( table, limit_results = TRUE, detail = "all", - endpoint = "http://localhost:8000/api/" + endpoint = "http://127.0.0.1:8000/api/" ) } \arguments{ diff --git a/man/get_fields.Rd b/man/get_fields.Rd index feceba21..7d240918 100644 --- a/man/get_fields.Rd +++ b/man/get_fields.Rd @@ -4,7 +4,7 @@ \alias{get_fields} \title{Get fields from table} \usage{ -get_fields(table, endpoint = "http://localhost:8000/api/") +get_fields(table, endpoint = "http://127.0.0.1:8000/api/") } \arguments{ \item{table}{a \code{string} specifying the name of the table} diff --git a/man/get_id.Rd b/man/get_id.Rd index c3d9d500..92d753c0 100644 --- a/man/get_id.Rd +++ b/man/get_id.Rd @@ -4,7 +4,7 @@ \alias{get_id} \title{Get ID} \usage{ -get_id(table, query = list(), endpoint = "http://localhost:8000/api/") +get_id(table, query = list(), endpoint = "http://127.0.0.1:8000/api/") } \arguments{ \item{table}{a \code{string} specifying the name of the table} diff --git a/man/get_tables.Rd b/man/get_tables.Rd index 4a6b19c4..b5b8ff7b 100644 --- a/man/get_tables.Rd +++ b/man/get_tables.Rd @@ -4,7 +4,7 @@ \alias{get_tables} \title{Get tables from registry} \usage{ -get_tables(endpoint = "http://localhost:8000/api/") +get_tables(endpoint = "http://127.0.0.1:8000/api/") } \arguments{ \item{endpoint}{a \code{string} specifying the registry endpoint} diff --git a/man/get_url.Rd b/man/get_url.Rd index 6895e797..0b2484cd 100644 --- a/man/get_url.Rd +++ b/man/get_url.Rd @@ -4,7 +4,7 @@ \alias{get_url} \title{Get URL} \usage{ -get_url(table, query = list(), endpoint = "http://localhost:8000/api/") +get_url(table, query = list(), endpoint = "http://127.0.0.1:8000/api/") } \arguments{ \item{table}{a \code{string} specifying the name of the table} diff --git a/man/new_author.Rd b/man/new_author.Rd index 9c8f540a..278a2352 100644 --- a/man/new_author.Rd +++ b/man/new_author.Rd @@ -4,7 +4,7 @@ \alias{new_author} \title{Post entry to author table} \usage{ -new_author(name, identifier, endpoint = "http://localhost:8000/api/") +new_author(name, identifier, endpoint = "http://127.0.0.1:8000/api/") } \arguments{ \item{name}{a \code{string} specifying the full name or organisation name of diff --git a/man/new_code_repo_release.Rd b/man/new_code_repo_release.Rd index 72e713bb..2c5f6673 100644 --- a/man/new_code_repo_release.Rd +++ b/man/new_code_repo_release.Rd @@ -9,7 +9,7 @@ new_code_repo_release( version, object_url, website, - endpoint = "http://localhost:8000/api/" + endpoint = "http://127.0.0.1:8000/api/" ) } \arguments{ diff --git a/man/new_code_run.Rd b/man/new_code_run.Rd index 8ee2ca86..1b19938e 100644 --- a/man/new_code_run.Rd +++ b/man/new_code_run.Rd @@ -12,7 +12,7 @@ new_code_run( submission_script_url, inputs_urls = list(), outputs_urls = list(), - endpoint = "http://localhost:8000/api/" + endpoint = "http://127.0.0.1:8000/api/" ) } \arguments{ diff --git a/man/new_data_product.Rd b/man/new_data_product.Rd index e6830e2b..efd29a5e 100644 --- a/man/new_data_product.Rd +++ b/man/new_data_product.Rd @@ -9,7 +9,7 @@ new_data_product( version, object_url, namespace_url, - endpoint = "http://localhost:8000/api/" + endpoint = "http://127.0.0.1:8000/api/" ) } \arguments{ diff --git a/man/new_external_object.Rd b/man/new_external_object.Rd index e7fa9cb9..bf811df5 100644 --- a/man/new_external_object.Rd +++ b/man/new_external_object.Rd @@ -12,7 +12,7 @@ new_external_object( description, data_product_url, original_store_url, - endpoint = "http://localhost:8000/api/" + endpoint = "http://127.0.0.1:8000/api/" ) } \arguments{ diff --git a/man/new_file_type.Rd b/man/new_file_type.Rd index 2414b493..e8d4f969 100644 --- a/man/new_file_type.Rd +++ b/man/new_file_type.Rd @@ -4,7 +4,7 @@ \alias{new_file_type} \title{Post entry to file_type table} \usage{ -new_file_type(name, extension, endpoint = "http://localhost:8000/api/") +new_file_type(name, extension, endpoint = "http://127.0.0.1:8000/api/") } \arguments{ \item{name}{a \code{string} specifying the name of the file type} diff --git a/man/new_issue.Rd b/man/new_issue.Rd index 9eef914d..09e0c49a 100644 --- a/man/new_issue.Rd +++ b/man/new_issue.Rd @@ -8,7 +8,7 @@ new_issue( severity, description, component_issues, - endpoint = "http://localhost:8000/api/" + endpoint = "http://127.0.0.1:8000/api/" ) } \arguments{ diff --git a/man/new_keyword.Rd b/man/new_keyword.Rd index 403ddc10..50f6ef2f 100644 --- a/man/new_keyword.Rd +++ b/man/new_keyword.Rd @@ -8,7 +8,7 @@ new_keyword( object_url, keyphrase, identifier, - endpoint = "http://localhost:8000/api/" + endpoint = "http://127.0.0.1:8000/api/" ) } \arguments{ diff --git a/man/new_licence.Rd b/man/new_licence.Rd index 6634961a..f033b72f 100644 --- a/man/new_licence.Rd +++ b/man/new_licence.Rd @@ -4,7 +4,7 @@ \alias{new_licence} \title{Post entry to licence table} \usage{ -new_licence(object_url, licence_info, endpoint = "http://localhost:8000/api/") +new_licence(object_url, licence_info, endpoint = "http://127.0.0.1:8000/api/") } \arguments{ \item{object_url}{a \code{string} specifying the URL of an \code{object}} diff --git a/man/new_namespace.Rd b/man/new_namespace.Rd index 4ddbb1ca..56468af8 100644 --- a/man/new_namespace.Rd +++ b/man/new_namespace.Rd @@ -8,7 +8,7 @@ new_namespace( name, full_name, website, - endpoint = "http://localhost:8000/api/" + endpoint = "http://127.0.0.1:8000/api/" ) } \arguments{ diff --git a/man/new_object.Rd b/man/new_object.Rd index e464433d..75925419 100644 --- a/man/new_object.Rd +++ b/man/new_object.Rd @@ -9,7 +9,7 @@ new_object( storage_location_url, authors_url, file_type_url, - endpoint = "http://localhost:8000/api/" + endpoint = "http://127.0.0.1:8000/api/" ) } \arguments{ diff --git a/man/new_object_component.Rd b/man/new_object_component.Rd index 32f65e59..18551853 100644 --- a/man/new_object_component.Rd +++ b/man/new_object_component.Rd @@ -10,7 +10,7 @@ new_object_component( description, whole_object = FALSE, issues_urls, - endpoint = "http://localhost:8000/api/" + endpoint = "http://127.0.0.1:8000/api/" ) } \arguments{ diff --git a/man/new_quality_controlled.Rd b/man/new_quality_controlled.Rd index 3cb35c8a..691f8860 100644 --- a/man/new_quality_controlled.Rd +++ b/man/new_quality_controlled.Rd @@ -4,7 +4,7 @@ \alias{new_quality_controlled} \title{Post entry to quality_controlled table} \usage{ -new_quality_controlled(object_url, endpoint = "http://localhost:8000/api/") +new_quality_controlled(object_url, endpoint = "http://127.0.0.1:8000/api/") } \arguments{ \item{object_url}{a \code{string} specifying the URL of an \code{object}} diff --git a/man/new_storage_location.Rd b/man/new_storage_location.Rd index f10b423f..39af80c9 100644 --- a/man/new_storage_location.Rd +++ b/man/new_storage_location.Rd @@ -9,7 +9,7 @@ new_storage_location( hash, public, storage_root_url, - endpoint = "http://localhost:8000/api/" + endpoint = "http://127.0.0.1:8000/api/" ) } \arguments{ diff --git a/man/new_storage_root.Rd b/man/new_storage_root.Rd index 5ef25fdc..fa9e8b90 100644 --- a/man/new_storage_root.Rd +++ b/man/new_storage_root.Rd @@ -4,7 +4,7 @@ \alias{new_storage_root} \title{Post entry to storage_root table} \usage{ -new_storage_root(root, local, endpoint = "http://localhost:8000/api/") +new_storage_root(root, local, endpoint = "http://127.0.0.1:8000/api/") } \arguments{ \item{root}{a \code{string} specifying the URI of a diff --git a/man/new_user_author.Rd b/man/new_user_author.Rd index ca60a064..298e8144 100644 --- a/man/new_user_author.Rd +++ b/man/new_user_author.Rd @@ -4,7 +4,7 @@ \alias{new_user_author} \title{Post entry to user_author table} \usage{ -new_user_author(user_url, author_url, endpoint = "http://localhost:8000/api/") +new_user_author(user_url, author_url, endpoint = "http://127.0.0.1:8000/api/") } \arguments{ \item{user_url}{a \code{string} specifying the URL of an existing diff --git a/man/rDataPipeline-package.Rd b/man/rDataPipeline-package.Rd index 1677ed67..2d498540 100644 --- a/man/rDataPipeline-package.Rd +++ b/man/rDataPipeline-package.Rd @@ -26,7 +26,7 @@ Useful links: Authors: \itemize{ - \item Sonia Mitchell \email{sonia.mitchell@glasgow.ac.uk} (\href{https://orcid.org/0000-0003-1536-2066}{ORCID}) + \item Sonia Mitchell (\href{https://orcid.org/0000-0003-1536-2066}{ORCID}) } } diff --git a/tests/testthat.R b/tests/testthat.R index df120ffe..6ea95e19 100644 --- a/tests/testthat.R +++ b/tests/testthat.R @@ -5,7 +5,7 @@ library(rDataPipeline) # registry and CLI being installed and will therefore fail. if (Sys.getenv("_RUN_TESTS_") != "") { - Sys.setenv(FDP_endpoint = "http://localhost:8000/api/") + Sys.setenv(FDP_endpoint = "http://127.0.0.1:8000/api/") endpoint <- Sys.getenv("FDP_endpoint") testthat::test_check("rDataPipeline") }