Skip to content

Commit cfa45f5

Browse files
committed
Repair improper attribution of original copyright/license.
1 parent 5cebaa3 commit cfa45f5

3 files changed

Lines changed: 52 additions & 7 deletions

File tree

LICENSE

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,24 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
1919
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2020
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2121
THE SOFTWARE.
22+
23+
================================================================================
24+
Portions of this software are based in part on the work of Nick Ficano.
25+
Use that earlier work requires inclusion of this additional notice,
26+
which continues to apply to those portions:
27+
28+
ISC License
29+
30+
Copyright (c) 2016, Nick Ficano
31+
32+
Permission to use, copy, modify, and/or distribute this software for any
33+
purpose with or without fee is hereby granted, provided that the above
34+
copyright notice and this permission notice appear in all copies.
35+
36+
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
37+
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
38+
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
39+
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
40+
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
41+
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
42+
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

README.rst

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ python-lambda-4dn
2020

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

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

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

42+
Important Legal Notice
43+
======================
44+
45+
The original `Python-lambda <https://pypi.python.org/pypi/python-lambda>`_ is licensed under
46+
an ISCL license. `The version of that license active at time of the fork is here
47+
<https://github.com/nficano/python-lambda/blob/01f1b8c3651de4e772618851b2117277ca95b1b4/LICENSE>`_.
48+
Github's summary of that license describes it as:
49+
50+
A permissive license lets people do anything with your code with proper attribution
51+
and without warranty. The ISC license is functionally equivalent to the BSD 2-Clause
52+
and MIT licenses, removing some language that is no longer necessary.
53+
54+
Since our derivative work is covered under the MIT license, and on a theory
55+
that the underlying license is equivalent to the MIT license,
56+
we shorthand our licensing requirements as just "MIT" because that's more consistent
57+
with how we describe licensing for other 4DN-DCIC software.
58+
However, for the properly formal legal detail,
59+
please refer to our actual `LICENSE <LICENSE>`_.
60+
4261
System Requirements
4362
===================
4463

pyproject.toml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "python-lambda-4dn"
33
version = "2.0.0b1"
44
description = "A forked version of python-lambda for 4DN-DCIC use in packaging and deploying lambda functions."
55
authors = ["4DN-DCIC Team <support@4dnucleome.org>"]
6-
license = "ISCL"
6+
license = "MIT"
77
keywords = ["python-lambda"]
88
readme = "README.rst"
99
homepage = "https://github.com/4dn-dcic/python-lambda"
@@ -18,6 +18,11 @@ classifiers = [
1818
'Natural Language :: English',
1919
'Programming Language :: Python :: 3.6',
2020
]
21+
include = [
22+
# The history file is unreferenced and empty. -kmp 12-Mar-2020
23+
# "HISTORY.rst",
24+
"LICENSE",
25+
]
2126

2227
[tool.poetry.dependencies]
2328
python = ">=3.6,<3.7"

0 commit comments

Comments
 (0)