Skip to content

Commit

Permalink
Repair improper attribution of original copyright/license.
Browse files Browse the repository at this point in the history
  • Loading branch information
netsettler committed Mar 12, 2020
1 parent 5cebaa3 commit cfa45f5
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 7 deletions.
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,24 @@ 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.

================================================================================
Portions of this software are based in part on the work of Nick Ficano.
Use that earlier work requires inclusion of this additional notice,
which continues to apply to those portions:

ISC License

Copyright (c) 2016, Nick Ficano

Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted, provided that the above
copyright notice and this permission notice appear in all copies.

THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
31 changes: 25 additions & 6 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ python-lambda-4dn

This is a toolset for developing and deploying *serverless* Python code in AWS Lambda.

Important
=========
This is a FORK of Nick Ficano's `Python-lambda <https://pypi.python.org/pypi/python-lambda>`_
package. It will NOT be updated regularly and is frozen for the needs of projects at the
`4D Nucleome Data Coordination and Integration Center (4DN-DCIC)
<https://github.com/4dn-dcic>`_.
.. Important::

This is a FORK of Nick Ficano's `Python-lambda <https://pypi.python.org/pypi/python-lambda>`_
package. It will NOT be updated regularly and is frozen for the needs of projects at the
`4D Nucleome Data Coordination and Integration Center (4DN-DCIC)
<https://github.com/4dn-dcic>`_.

Description
===========
Expand All @@ -39,6 +39,25 @@ is not as simple as it could be.
The *Python-Lambda* library takes away the guess work of developing your Python-Lambda
services by providing you a toolset to streamline the annoying parts.

Important Legal Notice
======================

The original `Python-lambda <https://pypi.python.org/pypi/python-lambda>`_ is licensed under
an ISCL license. `The version of that license active at time of the fork is here
<https://github.com/nficano/python-lambda/blob/01f1b8c3651de4e772618851b2117277ca95b1b4/LICENSE>`_.
Github's summary of that license describes it as:

A permissive license lets people do anything with your code with proper attribution
and without warranty. The ISC license is functionally equivalent to the BSD 2-Clause
and MIT licenses, removing some language that is no longer necessary.

Since our derivative work is covered under the MIT license, and on a theory
that the underlying license is equivalent to the MIT license,
we shorthand our licensing requirements as just "MIT" because that's more consistent
with how we describe licensing for other 4DN-DCIC software.
However, for the properly formal legal detail,
please refer to our actual `LICENSE <LICENSE>`_.

System Requirements
===================

Expand Down
7 changes: 6 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "python-lambda-4dn"
version = "2.0.0b1"
description = "A forked version of python-lambda for 4DN-DCIC use in packaging and deploying lambda functions."
authors = ["4DN-DCIC Team <support@4dnucleome.org>"]
license = "ISCL"
license = "MIT"
keywords = ["python-lambda"]
readme = "README.rst"
homepage = "https://github.com/4dn-dcic/python-lambda"
Expand All @@ -18,6 +18,11 @@ classifiers = [
'Natural Language :: English',
'Programming Language :: Python :: 3.6',
]
include = [
# The history file is unreferenced and empty. -kmp 12-Mar-2020
# "HISTORY.rst",
"LICENSE",
]

[tool.poetry.dependencies]
python = ">=3.6,<3.7"
Expand Down

0 comments on commit cfa45f5

Please sign in to comment.