Skip to content

Commit

Permalink
Merge pull request #153 from GlobalFishingWatch/develop
Browse files Browse the repository at this point in the history
v3 to main
  • Loading branch information
AndreaSanchezTapia authored Jul 1, 2024
2 parents 215d0b0 + 727d661 commit f806284
Show file tree
Hide file tree
Showing 110 changed files with 10,628 additions and 13,131 deletions.
6 changes: 6 additions & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,9 @@
CodeOfConduct.md
Contributing.md
docs/
pkgdown
data-raw
^gfwr\.Rcheck$
^gfwr.*\.tar\.gz$
^gfwr.*\.tgz$
^data-raw$
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,7 @@
.Rdata
.httr-oauth
.DS_Store
gfwr.Rcheck/
gfwr*.tar.gz
gfwr*.tgz
inst/doc
21 changes: 11 additions & 10 deletions CodeOfConduct.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
## Code of conduct
# Code of conduct


### Our pledge
## Our pledge

We as members, contributors, and leaders pledge to make participation in the `gfwr` contributing
and users community a harassment-free experience for everyone, regardless of age, body
Expand All @@ -14,7 +14,7 @@ We pledge to act and interact in ways that contribute to an open, welcoming,
diverse, inclusive, and healthy community.


### Our standards
## Our standards

Examples of behavior that contributes to a positive environment for the
community include:
Expand All @@ -34,7 +34,7 @@ Examples of unacceptable behavior include:
* Other conduct which could reasonably be considered inappropriate in a professional setting.


### Enforcement responsibilities
## Enforcement responsibilities

The `gfwr` maintainers are responsible for clarifying and enforcing our standards of
acceptable behavior and will take appropriate and fair corrective action in
Expand All @@ -47,16 +47,17 @@ not aligned to this Code of Conduct, and will communicate reasons for moderation
decisions when appropriate.


### Scope
## Scope

This Code of Conduct applies within all `gfwr` community spaces, and also applies when
an individual is officially representing the community in public spaces.
Examples of representing the `gfwr` community include using an official `gfwr` e-mail address,
posting via an official social media account, or acting as an appointed
representative at an online or offline event.
Examples of representing the `gfwr` community include using an official `gfwr`
communication channel, such as the GitHub community discussions, posting via an
official social media account, or acting as an appointed representative at an online
or offline event.


### Enforcement
## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported to the `gfwr` package maintainers either publicly by
Expand All @@ -69,7 +70,7 @@ All maintainers are obligated to respect the privacy and security of the
reporter of any incident.


### Enforcement guidelines
## Enforcement guidelines

The maintainers will follow these Community Impact Guidelines in determining
the consequences for any action they deem in violation of this Code of Conduct:
Expand Down
28 changes: 22 additions & 6 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: gfwr
Title: Interactions with GFW APIs providing data tibbles
Version: 1.1.1
Title: Access data from Global Fishing Watch APIs
Version: 2.0.0
Authors@R: c(
person("Tyler", "Clavelle", , "[email protected]", role = c("aut", "cre"),
comment = c(ORCID = "0000-0002-2155-2459")),
Expand All @@ -14,22 +14,38 @@ Authors@R: c(
comment = c(ORCID = "0000-0002-3521-4338"))
)
Description: This package connects to several Global Fishing Watch APIs to get vessel and events information in an R-friendly format.
License: file LICENSE
License: Apache License (>= 2)
Encoding: UTF-8
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.3.0
RoxygenNote: 7.3.1
Imports:
dplyr,
geojsonsf,
httr2,
jsonlite,
magrittr,
purrr,
readr,
rjson,
rlang,
tibble,
tidyr
tidyr,
methods,
class
Suggests:
glue
devtools,
ggplot2,
glue,
knitr,
qpdf,
rmarkdown,
rnaturalearth,
rnaturalearthdata,
scales,
sf
URL: https://github.com/GlobalFishingWatch/gfwr
BugReports: https://github.com/GlobalFishingWatch/gfwr/issues
Depends:
R (>= 2.10)
LazyData: true
VignetteBuilder: knitr
201 changes: 0 additions & 201 deletions LICENSE

This file was deleted.

Loading

0 comments on commit f806284

Please sign in to comment.