Skip to content

Commit

Permalink
Changing licence to LGPL-3.0, version 0.9995
Browse files Browse the repository at this point in the history
  • Loading branch information
ZekeMarshall committed Apr 26, 2024
1 parent 9223d43 commit 29f6ffe
Show file tree
Hide file tree
Showing 11 changed files with 183 additions and 410 deletions.
1 change: 0 additions & 1 deletion .Rprofile

This file was deleted.

2 changes: 1 addition & 1 deletion CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ keywords:
- NVC
- Vegetation Science
- Vegetation Survey
license: CC BY 4.0
license: LGPL-3.0
6 changes: 3 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: RMAVIS
Title: Assign Vegetation Survey Data to GB NVC Communities
Version: 0.9994
Date: 2024-04-21
Version: 0.9995
Date: 2024-04-26
Authors@R: c(person(given = "Zeke",
family = "Marshall",
role = c("aut", "cre"),
Expand All @@ -23,7 +23,7 @@ Authors@R: c(person(given = "Zeke",
role = c("aut"),
comment = c(ORCID = "0000-0002-0664-9420")))
Description: A R Shiny application for the assignment of vegetation survey plot data to GB NVC communities with additional exploratory analyses.
License: CC BY 4.0
License: LGPL (>= 3)
Encoding: UTF-8
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.3.1
Expand Down
554 changes: 161 additions & 393 deletions LICENSE.md

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@ title: "Release notes for `RMAVIS`"
output: html_document
---

# RMAVIS 0.9995 (2024-04-26)
* Modifications:
- Changing licence to the OSI-approved LGPL-3.0 licence to ensure compliance with JOSS.
* Fixes: NA
* New Features: NA

# RMAVIS 0.9994 (2024-04-21)
* Modifications: NA
* Fixes:
Expand Down
8 changes: 4 additions & 4 deletions README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ knitr::opts_chunk$set(
# RMAVIS

<!-- badges: start -->
[![Generic badge](https://img.shields.io/badge/Version-0.9994-green.svg)]()
[![Generic badge](https://img.shields.io/badge/Version-0.9995-green.svg)]()
[![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active)
[![DOI](https://zenodo.org/badge/722095560.svg)](https://zenodo.org/badge/latestdoi/722095560)
[![status](https://joss.theoj.org/papers/460c6f934a108fcf5a16d0f2ab77492e/status.svg)](https://joss.theoj.org/papers/460c6f934a108fcf5a16d0f2ab77492e)
[![License: CC BY 4.0](https://img.shields.io/badge/License-CC_BY_4.0-lightgrey.svg)](https://creativecommons.org/licenses/by/4.0/)
[![License: CC BY 4.0](https://img.shields.io/badge/License-LGPL 3.0-lightgrey.svg)](https://opensource.org/license/lgpl-3-0)
<!-- badges: end -->

The RMAVIS R Shiny web application is a tool to assist in the assignment of vegetation plot
Expand All @@ -29,8 +29,8 @@ sample data to UK National Vegetation Classification units, with additional expl
You can run RMAVIS from [GitHub](https://github.com/ZekeMarshall/RMAVIS) by cloning the
repository, calling `renv::restore()`, and then calling `shiny::runApp("app.R")`.

If `renv::restore()` fails run `install.packages(unique(renv::dependencies()$Package), dependencies = TRUE)`.
Note that whilst the correct dependencies will be installed,
If `renv::restore()` fails run `install.packages(unique(renv::dependencies()$Package), dependencies = TRUE)`,
note that whilst the correct dependencies will be installed,
the versions may not match those in the renv.lock file,
and so the correct functioning of the app cannot be guaranteed.

8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
<!-- badges: start -->

[![Generic
badge](https://img.shields.io/badge/Version-0.9994-green.svg)]()
badge](https://img.shields.io/badge/Version-0.9995-green.svg)]()
[![Project Status: Active – The project has reached a stable, usable
state and is being actively
developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active)
[![DOI](https://zenodo.org/badge/722095560.svg)](https://zenodo.org/badge/latestdoi/722095560)
[![status](https://joss.theoj.org/papers/460c6f934a108fcf5a16d0f2ab77492e/status.svg)](https://joss.theoj.org/papers/460c6f934a108fcf5a16d0f2ab77492e)
[![License: CC BY
4.0](https://img.shields.io/badge/License-CC_BY_4.0-lightgrey.svg)](https://creativecommons.org/licenses/by/4.0/)
4.0](https://img.shields.io/badge/License-LGPL%203.0-lightgrey.svg)](https://opensource.org/license/lgpl-3-0)
<!-- badges: end -->

The RMAVIS R Shiny web application is a tool to assist in the assignment
Expand All @@ -25,7 +25,7 @@ by cloning the repository, calling `renv::restore()`, and then calling
`shiny::runApp("app.R")`.

If `renv::restore()` fails run
`install.packages(unique(renv::dependencies()$Package), dependencies = TRUE)`.
Note that whilst the correct dependencies will be installed, the
`install.packages(unique(renv::dependencies()$Package), dependencies = TRUE)`,
note that whilst the correct dependencies will be installed, the
versions may not match those in the renv.lock file, and so the correct
functioning of the app cannot be guaranteed.
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
build:
context: .
dockerfile: Dockerfile
image: "<container registry url>/rmavis:v0.9994"
image: "<container registry url>/rmavis:v0.9995"
container_name: "rmavis"
restart: always
privileged: true
Expand Down
2 changes: 1 addition & 1 deletion docs/documentation.Rmd
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: "RMAVIS - Documentation"
subtitle: "v0.9994"
subtitle: "v0.9995"
# output:
# bookdown::word_document2:
# always_allow_html: true
Expand Down
2 changes: 1 addition & 1 deletion report/Report.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ reportOptions_options <- list(`NVC Assignment` = c("Site, Czekanowski" = "nvcAss

```{r RMAVISVersion, echo=FALSE, message=FALSE, warning=FALSE, results='asis'}
cat("**Version:** ", as.character("v0.9994"), sep = "")
cat("**Version:** ", as.character("v0.9995"), sep = "")
```

Expand Down
2 changes: 1 addition & 1 deletion www/documentation.html
Original file line number Diff line number Diff line change
Expand Up @@ -1711,7 +1711,7 @@


<h1 class="title toc-ignore">RMAVIS - Documentation</h1>
<h3 class="subtitle">v0.9993</h3>
<h3 class="subtitle">v0.9995</h3>

</div>

Expand Down

0 comments on commit 29f6ffe

Please sign in to comment.