Skip to content

Commit

Permalink
Relicense as Blue Oak Model Licence 1.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
urschrei committed Jul 2, 2024
1 parent 3610137 commit a795277
Show file tree
Hide file tree
Showing 10 changed files with 125 additions and 98 deletions.
2 changes: 1 addition & 1 deletion CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ date-released: 2019-05-18
doi: "10.5281/zenodo.2917290"
keywords:
- zotero
license: MIT
license: BlueOak-1.0.0
repository-code: "https://github.com/urschrei/pyzotero"
version: "1.3.15"
86 changes: 83 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,86 @@ Contributions are welcome. Please bear the following in mind:
- If possible, [squash](http://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) your commits before opening a pull request, unless it makes no sense to do so
- If in doubt, comment your code.

## License of Contributed Code
Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you shall be MIT licensed, without any additional terms or conditions.
Please note that pull requests with licenses that are more restrictive than or otherwise incompatible with the MIT license will not be accepted.
# License of Contributed Code
Contributions are licensed under the Blue Oak Contributor Licence 1.0.0. See below

# Blue Oak Contributor License

Version 1.0.0

## Purpose

This license gives the steward of a software project
the legal rights and assurances it needs to accept
contributions covered by intellectual property rights.

## Copyright

The contributor licenses the steward to do everything with
their contributions that would otherwise infringe their
copyrights in them.

## Patent

The contributor licenses the steward to do everything with
their contributions that would otherwise infringe any patent
claims they can license or become able to license.

## Sublicensing

The steward can license the contributions to others in
turn, under whatever terms it chooses.

## Reliability

The contributor cannot revoke this license.

## Termination

The contributor can stop this license from covering
contributions submitted in the future by writing the steward
through one of the channels it uses to receive contributions.
Contributions the contributor submitted before remain under
this license.

## Awareness

The contributor is aware that because of legal rules and
contracts, they may need to get someone else's permission to
submit contributions, even of their own work. For example,
"work made for hire" rules can make employers and clients
the owners of copyrights in the contributor's work.
Contracts with clients, or to form new companies, may make
them the owners of copyrights in the contributor's work.

## Rights

All work in contributions the contributor submits for
inclusion in the project will be either:

- their own work, which they own the copyrights in or
have permission to submit

- work licensed by others under permissive license
terms that Blue Oak Council rates "bronze" or better at
<https://blueoakcouncil.org/list>

## Notices

The contributor promises to copy copyright notices,
license terms, and other licensing-related notices for
work licensed by others in their contributions, so the
steward can tell what work is licensed by others under
what terms and follow their notice requirements.

## No Liability

***As far as the law allows, contributions under this
license come as is, without any warranty or condition,
except those under "Rights" above.***

***As far as the law allows, the contributor will not be
liable to anyone for any damages related to contributions
under this license, under any kind of legal claim, except
for claims under "Rights" above.***

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

Version 1.0.0

## Purpose

This license gives everyone as much permission to work with this software as possible, while protecting contributors from liability.

## Acceptance

In order to receive this license, you must agree to its rules. The rules of this license are both obligations under that agreement and conditions to your license. You must not do anything with this software that triggers a rule that you cannot or will not follow.

## Copyright

Each contributor licenses you to do everything with this software that would otherwise infringe that contributor's copyright in it.

## Notices

You must ensure that everyone who gets a copy of any part of this software from you, with or without changes, also gets the text of this license or a link to <https://blueoakcouncil.org/license/1.0.0>.

## Excuse

If anyone notifies you in writing that you have not complied with [Notices](#notices), you can keep your license by taking all practical steps to comply within 30 days after the notice. If you do not do so, your license ends immediately.

## Patent

Each contributor licenses you to do everything with this software that would otherwise infringe any patent claims they can license or become able to license.

## Reliability

No contributor can revoke this license.

## No Liability

***As far as the law allows, this software comes as is, without any warranty or condition, and no contributor will be liable to anyone for any damages related to this software or this license, under any kind of legal claim.***
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[![Supported Python versions](https://img.shields.io/pypi/pyversions/Pyzotero.svg?style=flat)](https://pypi.python.org/pypi/Pyzotero/) [![Docs](https://readthedocs.org/projects/pyzotero/badge/?version=latest)](http://pyzotero.readthedocs.org/en/latest/?badge=latest) [![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](license.txt) [![PyPI Version](https://img.shields.io/pypi/v/Pyzotero.svg)](https://pypi.python.org/pypi/Pyzotero) [![Anaconda-Server Badge](https://anaconda.org/conda-forge/pyzotero/badges/version.svg)](https://anaconda.org/conda-forge/pyzotero) [![Downloads](https://pepy.tech/badge/pyzotero)](https://pepy.tech/project/pyzotero)
[![Supported Python versions](https://img.shields.io/pypi/pyversions/Pyzotero.svg?style=flat)](https://pypi.python.org/pypi/Pyzotero/) [![Docs](https://readthedocs.org/projects/pyzotero/badge/?version=latest)](http://pyzotero.readthedocs.org/en/latest/?badge=latest) [![PyPI Version](https://img.shields.io/pypi/v/Pyzotero.svg)](https://pypi.python.org/pypi/Pyzotero) [![Anaconda-Server Badge](https://anaconda.org/conda-forge/pyzotero/badges/version.svg)](https://anaconda.org/conda-forge/pyzotero) [![Downloads](https://pepy.tech/badge/pyzotero)](https://pepy.tech/project/pyzotero)

# Pyzotero: An API Client for the Zotero API

Expand Down Expand Up @@ -75,13 +75,13 @@ A sample citation (APA 6th edition) might look like:
# License

Pyzotero is licensed under the [MIT license][8]. See [license.txt](license.txt) for details.
Pyzotero is licensed under the [Blue Oak Model Licence 1.0.0][8]. See [LICENCE.md](LICENCE.md) for details.

[1]: https://www.zotero.org/support/dev/web_api/v3/start
[2]: https://www.zotero.org/settings/keys/new
[3]: http://pyzotero.readthedocs.org/en/latest/
[7]: https://nose2.readthedocs.io/en/latest/
[8]: http://opensource.org/licenses/MIT
[8]: https://opensource.org/license/blue-oak-model-license
[9]: https://github.com/urschrei/pyzotero/tree/dev
[10]: http://www.pip-installer.org/en/latest/index.html
† This isn't strictly true: you only need an API key for personal libraries and non-public group libraries.
Expand Down
2 changes: 1 addition & 1 deletion doc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1087,7 +1087,7 @@ Most Read API methods return **lists** of **dicts** or, in the case of tag metho

License
=======
Pyzotero is licensed under the `MIT <http://opensource.org/licenses/MIT>`_ license.
Pyzotero is licensed under the `Blue Oak Model Licence <https://opensource.org/license/blue-oak-model-license>`_ license.


Cat Picture
Expand Down
21 changes: 0 additions & 21 deletions license.txt

This file was deleted.

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ classifiers = [
"Intended Audience :: Developers",
"Intended Audience :: Science/Research",
"Intended Audience :: Education",
"License :: OSI Approved :: MIT License",
"License :: OSI Approved :: Blue Oak Model License (BlueOak-1.0.0)",
"Operating System :: OS Independent",
"Topic :: Software Development :: Libraries :: Python Modules",
]
Expand Down
23 changes: 0 additions & 23 deletions src/pyzotero/zotero.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,29 +5,6 @@
Created by Stephan Hügel on 2011-02-28
This file is part of Pyzotero.
The MIT License (MIT)
Copyright (c) 2015 Stephan Hügel
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.
"""

__author__ = "Stephan Hügel"
Expand Down
22 changes: 0 additions & 22 deletions src/pyzotero/zotero_errors.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,6 @@
Created by Stephan Hügel on 2011-03-04
This file is part of Pyzotero.
The MIT License (MIT)
Copyright (c) 2015 Stephan Hügel
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.
"""


Expand Down
24 changes: 1 addition & 23 deletions tests/test_zotero.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,11 @@
Tests for the Pyzotero module
This file is part of Pyzotero.
The MIT License (MIT)
Copyright (c) 2015 Stephan Hügel
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.
"""

import os
import unittest
import time
import unittest

import httpretty
from dateutil import parser
Expand Down

0 comments on commit a795277

Please sign in to comment.