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

import rjsoncons and remove src files, unit tests #12

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 4 additions & 11 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,19 @@ Authors@R:
email = "mtmorgan.bioc@gmail.com",
comment = c(ORCID = "0000-0002-5874-8148")
),
person("Kayla", "Interdonato", role = "aut"),
person(
"Daniel", "Parker", role = "cph",
email = "danielaparker@yahoo.com",
comment = "jsoncons C++ library creator"
))
person("Kayla", "Interdonato", role = "aut"))
Description: The cellxgene data portal
(https://cellxgene.cziscience.com/) provides a graphical user
interface to collections of single-cell sequence data processed in
standard ways to 'count matrix' summaries. The cellxgenedp package
provides an alternative, R-based inteface, allowind data
discovery, viewing, and downloading.
License: Artistic-2.0 | BSL-1.0 | file LICENSE
License: Artistic-2.0 | file LICENSE
Encoding: UTF-8
Collate: db.R collections.R datasets.R files.R facets.R keys.R
cellxgene.R utilities.R cpp11.R jmespath.R cxg.R
cellxgene.R utilities.R cxg.R
Depends: dplyr
Imports: httr, curl, jsonlite, utils, tools, shiny, DT
LinkingTo: cpp11
Imports: httr, curl, jsonlite, utils, tools, shiny, DT, rjsoncons
Suggests:
zellkonverter,
SingleCellExperiment,
Expand All @@ -38,7 +32,6 @@ Suggests:
testthat (>= 3.0.0),
mockery
biocViews: SingleCell, DataImport, ThirdPartyClient
SystemRequirements: C++14
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.2.1
VignetteBuilder: knitr
Expand Down
11 changes: 0 additions & 11 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,16 +1,5 @@
This package is provided under the terms of the Artistic-2.0 License.

The license and copyright information for externally maintained
jsoncons library used by this package, with source code in the
inst/include directory, is as follows:

// Copyright Daniel Parker 2013 - 2020.
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE or copy at
// http://www.boost.org/LICENSE_1_0.txt)

Boost Software License - Version 1.0 - August 17th, 2003

Permission is hereby granted, free of charge, to any person or organization
obtaining a copy of the software and accompanying documentation covered by
this license (the "Software") to use, reproduce, display, distribute,
Expand Down
4 changes: 1 addition & 3 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ export(facets)
export(facets_filter)
export(files)
export(files_download)
export(jmespath)
export(jmespath_version)
importFrom(DT,datatable)
importFrom(DT,formatStyle)
importFrom(DT,renderDataTable)
Expand Down Expand Up @@ -48,6 +46,7 @@ importFrom(httr,status_code)
importFrom(httr,stop_for_status)
importFrom(httr,write_disk)
importFrom(jsonlite,parse_json)
importFrom(rjsoncons,jmespath)
importFrom(shiny,actionButton)
importFrom(shiny,hr)
importFrom(shiny,icon)
Expand All @@ -64,4 +63,3 @@ importFrom(tools,file_path_sans_ext)
importFrom(utils,browseURL)
importFrom(utils,head)
importFrom(utils,installed.packages)
useDynLib(cellxgenedp, .registration = TRUE)
9 changes: 0 additions & 9 deletions R/cpp11.R

This file was deleted.

2 changes: 2 additions & 0 deletions R/db.R
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,9 @@ db <-
details
}


#' @importFrom utils head
#' @importFrom rjsoncons jmespath
#'
#' @export
print.cellxgene_db <-
Expand Down
63 changes: 0 additions & 63 deletions R/jmespath.R

This file was deleted.

38 changes: 0 additions & 38 deletions inst/include/jsoncons/allocator_holder.hpp

This file was deleted.