From ba424e6c2ddd269108ba83e30e72ece17021cf96 Mon Sep 17 00:00:00 2001 From: Elia Robyn Lake Date: Tue, 25 Oct 2022 14:20:23 -0400 Subject: [PATCH] update to Apache license --- LICENSE.txt | 13 ++++++++++ MIT-LICENSE.txt | 19 --------------- NOTICE.md | 64 +++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 28 ++++++++++------------ pyproject.toml | 4 ++-- 5 files changed, 91 insertions(+), 37 deletions(-) create mode 100644 LICENSE.txt delete mode 100644 MIT-LICENSE.txt create mode 100644 NOTICE.md diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..f40c5b5 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,13 @@ +Copyright 2022 Robyn Speer + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. diff --git a/MIT-LICENSE.txt b/MIT-LICENSE.txt deleted file mode 100644 index 7dfec8d..0000000 --- a/MIT-LICENSE.txt +++ /dev/null @@ -1,19 +0,0 @@ -Copyright (c) 2015 Luminoso Technologies, Inc. - -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/NOTICE.md b/NOTICE.md new file mode 100644 index 0000000..828384d --- /dev/null +++ b/NOTICE.md @@ -0,0 +1,64 @@ +wordfreq +Copyright 2022 Robyn Speer + +# Attribution notes + +Robyn Speer must be credited as Robyn Speer, which is her maiden name, used on academic work. +Crediting her as Elia Robyn Lake (her married name) will make the credit less effective, as it will +not line up with other work. + +Crediting Robyn Speer by a different name than one of the above is a serious violation of the license, +in which case you do not have permission to use, copy, or redistribute wordfreq. + +If you use wordfreq in academic work, you must cite it. See "Citing wordfreq" in README.md. + +# Included licenses + +`wordfreq` is freely redistributable under the Apache license (see +`LICENSE.txt`), and it includes data files that may be +redistributed under a Creative Commons Attribution-ShareAlike 4.0 +license (). + +`wordfreq` contains data extracted from Google Books Ngrams +() and Google Books Syntactic Ngrams +(). +The terms of use of this data are: + + Ngram Viewer graphs and data may be freely used for any purpose, although + acknowledgement of Google Books Ngram Viewer as the source, and inclusion + of a link to http://books.google.com/ngrams, would be appreciated. + +`wordfreq` also contains data derived from the following Creative Commons-licensed +sources: + +- The Leeds Internet Corpus, from the University of Leeds Centre for Translation + Studies () + +- Wikipedia, the free encyclopedia () + +- ParaCrawl, a multilingual Web crawl () + +It contains data from OPUS OpenSubtitles 2018 +(), whose data originates from the +OpenSubtitles project () and may be used with +attribution to OpenSubtitles. + +It contains data from various SUBTLEX word lists: SUBTLEX-US, SUBTLEX-UK, +SUBTLEX-CH, SUBTLEX-DE, and SUBTLEX-NL, created by Marc Brysbaert et al. +(see citations below) and available at +. + +I (Robyn Speer) have obtained permission by e-mail from Marc Brysbaert to +distribute these wordlists in wordfreq, to be used for any purpose, not just +for academic use, under these conditions: + +- Wordfreq and code derived from it must credit the SUBTLEX authors. +- It must remain clear that SUBTLEX is freely available data. + +These terms are similar to the Creative Commons Attribution-ShareAlike license. + +Some additional data was collected by a custom application that watches the +streaming Twitter API, in accordance with Twitter's Developer Agreement & +Policy. This software gives statistics about words that are commonly used on +Twitter; it does not display or republish any Twitter content. + diff --git a/README.md b/README.md index 751716f..7ece49c 100644 --- a/README.md +++ b/README.md @@ -454,8 +454,8 @@ As of version 2.4.2, you no longer have to install dictionaries separately. ## License -`wordfreq` is freely redistributable under the MIT license (see -`MIT-LICENSE.txt`), and it includes data files that may be +`wordfreq` is freely redistributable under the Apache license (see +`LICENSE.txt`), and it includes data files that may be redistributed under a Creative Commons Attribution-ShareAlike 4.0 license (). @@ -508,24 +508,20 @@ If you use wordfreq in your research, please cite it! We publish the code through Zenodo so that it can be reliably cited using a DOI. The current citation is: -> Robyn Speer, Joshua Chin, Andrew Lin, Sara Jewett, & Lance Nathan. -> (2018, October 3). LuminosoInsight/wordfreq: v2.2. Zenodo. -> +> Robyn Speer. (2022). rspeer/wordfreq: v3.0 (v3.0.2). Zenodo. https://doi.org/10.5281/zenodo.7199437 The same citation in BibTex format: ``` -@misc{robyn_speer_2018_1443582, - author = {Robyn Speer and - Joshua Chin and - Andrew Lin and - Sara Jewett and - Lance Nathan}, - title = {LuminosoInsight/wordfreq: v2.2}, - month = oct, - year = 2018, - doi = {10.5281/zenodo.1443582}, - url = {https://doi.org/10.5281/zenodo.1443582} +@software{robyn_speer_2022_7199437, + author = {Robyn Speer}, + title = {rspeer/wordfreq: v3.0}, + month = sep, + year = 2022, + publisher = {Zenodo}, + version = {v3.0.2}, + doi = {10.5281/zenodo.7199437}, + url = {https://doi.org/10.5281/zenodo.7199437} } ``` diff --git a/pyproject.toml b/pyproject.toml index 98240c5..022f262 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,9 +1,9 @@ [tool.poetry] name = "wordfreq" -version = "3.0.2" +version = "3.0.3" description = "Look up the frequencies of words in many languages, based on many sources of data." authors = ["Robyn Speer "] -license = "MIT" +license = "Apache-2.0" readme = "README.md" homepage = "https://github.com/rspeer/wordfreq/"