Merge pull request #40 from nrennie/develop

nrennie · web-flow · commit 4953cda1c628 · 2022-05-07T16:05:05.000+01:00
update license
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -6,3 +6,4 @@ aRt.png
 ^docs$
 ^pkgdown$
 ^\.github$
+^LICENSE\.md$
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,13 +1,13 @@
 Package: aRt
 Title: Generative Art with R
-Version: 1.1.8
+Version: 1.1.9
 Authors@R: 
     person(given = "Nicola",
            family = "Rennie",
            role = c("aut", "cre"),
            email = "nrennie35@gmail.com")
 Description: Creates generative art using R.
-License: GPL (>= 2)
+License: MIT + file LICENSE
 Encoding: UTF-8
 LazyData: true
 Roxygen: list(markdown = TRUE)
diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,2 @@
+YEAR: 2022
+COPYRIGHT HOLDER: aRt authors
diff --git a/LICENSE.md b/LICENSE.md
@@ -0,0 +1,21 @@
+# MIT License
+
+Copyright (c) 2022 aRt authors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/NEWS.md b/NEWS.md
@@ -1,46 +1,48 @@
-# aRt 
+## aRt 1.1.9
 
-# aRt 1.1.8
+* update license
+
+## aRt 1.1.8
 
 * add `sunbursts()` function
 * add panel function
 * add {pkgdown website}
 
-# aRt 1.1.7
+## aRt 1.1.7
 
 * add GitHub actions
 * fix CI
 
-# aRt 1.1.6
+## aRt 1.1.6
 
 * Fix issues with `flow_fields()` rendering
 * Add custom `ggplot2` theme
 * add aRtData dependency
 * add `blending()` function
 
-# aRt 1.1.5
+## aRt 1.1.5
 
 * Switch `flow_fields()` to cartesian coords
 
-# aRt 1.1.4
+## aRt 1.1.4
 
 * Add `flow_fields()`
 * Fix missing `ggplot2::` in circles
 * Fix `no visible binding for global variable "new_group"`
 
-# aRt 1.1.3
+## aRt 1.1.3
 
 * Installation bug fix
 
-# aRt 1.1.2
+## aRt 1.1.2
 
 * `bubbles()` function fixed
 
-# aRt 1.1.1
+## aRt 1.1.1
 
 * `bubbles()` has been added.
 
-# aRt 1.1.0
+## aRt 1.1.0
 
 * `rectangles()` has been added.
 * News.md file now included.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# aRt <img src="https://github.com/nrennie/aRt/blob/main/man/figures/aRt.png?raw=true" align="right" width="120" />
+# aRt <img src="man/figures/logo.png" align="right" width="120" />
 
 
 aRt is an R package to create generative art. 
diff --git a/_pkgdown.yml b/_pkgdown.yml
@@ -1,4 +1,15 @@
 url: https://nrennie.github.io/aRt/
 template:
   bootstrap: 5
+authors:
+  Nicola Rennie:
+    href: https://nrennie.rbind.io/
+home:
+  links:
+  - text: Home
+    href: https://nrennie.github.io/
+  - text: Website
+    href: https://nrennie.rbind.io/
+  - text: Twitter
+    href: https://twitter.com/nrennie35
 
diff --git a/man/figures/logo.png b/man/figures/logo.png

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+YEAR: 2022`
	`2`	`+COPYRIGHT HOLDER: aRt authors`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# aRt <img src="https://github.com/nrennie/aRt/blob/main/man/figures/aRt.png?raw=true" align="right" width="120" />`
	`1`	`+# aRt <img src="man/figures/logo.png" align="right" width="120" />`
`2`	`2`
`3`	`3`
`4`	`4`	`aRt is an R package to create generative art.`