Skip to content

Commit

Permalink
Merge pull request #420 from USGS-R/prepare-for-dgec-transition
Browse files Browse the repository at this point in the history
Prepare for Upcoming DGEC Transition
  • Loading branch information
aappling-usgs committed Jul 2, 2023
2 parents f4808ad + e8e862e commit 7fb004b
Show file tree
Hide file tree
Showing 14 changed files with 555 additions and 219 deletions.
1 change: 1 addition & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ temp
^docs$
^pkgdown$
^CONDUCT\.md$
^streamMetabolizer\.Rproj$
25 changes: 25 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
## Code of Conduct

### Contributor Code of Conduct

As contributors and maintainers of this project, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.

We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, or religion.

Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory comments or personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.

Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. Project maintainers who do not follow the Code of Conduct may be removed from the project team.

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.

This Code of Conduct is adapted from the
[Contributor Covenant, version 1.0.0](https://www.contributor-covenant.org/version/1/0/0/code-of-conduct.html).


### USGS Code of Scientific Conduct

Additionally, all contributions to -- and interactions surrounding -- this project will abide by
the
[USGS Code of Scientific Conduct](https://www.usgs.gov/office-of-science-quality-and-integrity/fundamental-science-practices)
and the
[DOI Code of Development Conduct](https://github.com/DOI-BLM/01-guidance/blob/master/CODE_OF_CONDUCT.md).
25 changes: 0 additions & 25 deletions CONDUCT.md

This file was deleted.

14 changes: 14 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
## Contributing

Contributions are welcome from the community. Questions can be asked on the
[issues page](https://github.com/USGS-R/streamMetabolizer/issues).
Before creating a new issue, please take a moment to search
and make sure a similar issue does not already exist. If one does exist, you
can comment (most simply even with just a `:+1:`) to show your support for that
issue.

If you have direct contributions you would like considered for incorporation
into the project, you can
[fork this repository](https://help.github.com/articles/fork-a-repo/) and
[submit a pull request](https://help.github.com/articles/about-pull-requests/)
for review.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: streamMetabolizer
Type: Package
Title: Models for Estimating Aquatic Photosynthesis and Respiration
Version: 0.12.0
Date: 2021-07-05
Version: 0.12.1
Date: 2023-07-02
Author: Alison P. Appling, Robert O. Hall, Jr., Maite Arroita, and Charles B.
Yackulic
Authors@R: c(
Expand Down
10 changes: 10 additions & 0 deletions DISCLAIMER.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
## Disclaimer

This software is preliminary or provisional and is subject to revision. It is
being provided to meet the need for timely best science. The software has not
received final approval by the U.S. Geological Survey (USGS). No warranty,
expressed or implied, is made by the USGS or the U.S. Government as to the
functionality of the software and related material nor shall the fact of release
constitute any such warranty. The software is provided on the condition that
neither the USGS nor the U.S. Government shall be held liable for any damages
resulting from the authorized or unauthorized use of the software.
117 changes: 0 additions & 117 deletions LICENSE

This file was deleted.

43 changes: 43 additions & 0 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
## License

Unless otherwise noted, This project is in the public domain in the United
States because it contains materials that originally came from the United
States Geological Survey, an agency of the United States Department of
Interior. For more information, see the official USGS copyright policy at
https://www.usgs.gov/information-policies-and-instructions/copyrights-and-credits

Additionally, we waive copyright and related rights in the work
worldwide through the CC0 1.0 Universal public domain dedication.


### CC0 1.0 Universal Summary

This is a human-readable summary of the
[Legal Code (read the full text)][1].


#### No Copyright

The person who associated a work with this deed has dedicated the work to
the public domain by waiving all of his or her rights to the work worldwide
under copyright law, including all related and neighboring rights, to the
extent allowed by law.

You can copy, modify, distribute and perform the work, even for commercial
purposes, all without asking permission.


#### Other Information

In no way are the patent or trademark rights of any person affected by CC0,
nor are the rights that other persons may have in the work or in how the
work is used, such as publicity or privacy rights.

Unless expressly stated otherwise, the person who associated a work with
this deed makes no warranties about the work, and disclaims liability for
all uses of the work, to the fullest extent permitted by applicable law.
When using or citing the work, you should not imply endorsement by the
author or the affirmer.


[1]: https://creativecommons.org/publicdomain/zero/1.0/legalcode
25 changes: 17 additions & 8 deletions R/01-onLoad.R
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,22 @@
#' @importFrom utils available.packages contrib.url
#' @keywords internal
.onAttach <- function(libname, pkgname) {
packageStartupMessage(paste(strwrap(
"USGS Active Research Package: https://owi.usgs.gov/R/packages.html#research"), collapse='\n'))
packageStartupMessage(paste(strwrap(paste(
"This package was developed for research purposes.",
"We used it for our own applications and welcome flexible, resilient users who can help us test and improve the package.",
"Please give us feedback at https://github.com/USGS-R/streamMetabolizer/issues/new.\n")), collapse='\n'
))

packageStartupMessage(paste(c(
strwrap(paste(
"streamMetabolizer is a USGS Archive Research Package:",
"https://owi.usgs.gov/R/packages.html#research")),
'',
strwrap(paste(
"Project funding has ended and our maintenance time is limited,",
"but we do attempt to provide bug fixes and lightweight support as we are able.",
"Submit questions or suggestions to https://github.com/USGS-R/streamMetabolizer/issues.")),
'',
c("In summer or fall 2023, this package will move from",
"https://github.com/USGS-R/streamMetabolizer to",
"https://github.com/DOI-USGS/streamMetabolizer.",
"Please update your links accordingly.")),
collapse='\n'))

# Load deSolve because otherwise after a few model runs we're likely to get
# the following error. (It's possible this has been resolved by moving deSolve
# from Suggests to Imports)
Expand All @@ -19,6 +27,7 @@
## Error in .C("unlock_solver") :
## "unlock_solver" not resolved from current namespace (deSolve)
}

library(methods)

#' Define a package environment for storing data specific to a project during an
Expand Down
Loading

0 comments on commit 7fb004b

Please sign in to comment.