From 25acc76dedbb2223e0951dc92ec8cdc27bac6db5 Mon Sep 17 00:00:00 2001 From: Kent Pitman Date: Tue, 1 Aug 2023 13:56:23 -0400 Subject: [PATCH] Add some additional licenses to compensate for things pip-licenses isn't showing. --- LICENSE.txt | 2 +- dcicutils/license_utils.py | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/LICENSE.txt b/LICENSE.txt index adf7ced50..dbd9eb7db 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,6 +1,6 @@ The MIT License -Copyright 2017-2023 President and Fellows of Harvard College. +Copyright 2017-2023 President and Fellows of Harvard College Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/dcicutils/license_utils.py b/dcicutils/license_utils.py index 698379470..4cc1cd5f7 100644 --- a/dcicutils/license_utils.py +++ b/dcicutils/license_utils.py @@ -667,6 +667,10 @@ class C4InfrastructureLicenseChecker(LicenseChecker): # Ref: https://github.com/xlwings/jsondiff/blob/master/LICENSE 'jsondiff', + # This has an MIT license in its source repository + # Ref: https://github.com/pkerpedjiev/negspy/blob/master/LICENSE + 'negspy', + # This license statement is complicated, but seems adequately permissive. # Ref: https://foss.heptapod.net/python-libs/passlib/-/blob/branch/stable/LICENSE 'passlib', @@ -681,12 +685,20 @@ class C4InfrastructureLicenseChecker(LicenseChecker): # Ref: https://github.com/mk-fg/pretty-yaml/blob/master/COPYING 'pyaml', + # This uses a BSD license + # Ref: https://github.com/eliben/pycparser/blob/master/LICENSE + 'pycparser', + # The source repo for pyDes says this is under an MIT license # Ref: https://github.com/twhiteman/pyDes/blob/master/LICENSE.txt # pypi, probably wrongly, thinks this is in the public domain (as of 2023-07-21) # Ref: https://pypi.org/project/pyDes/ 'pyDes', + # This uses an MIT license + # Ref: https://github.com/pysam-developers/pysam/blob/master/COPYING + 'pysam', + # The version of python-lambda that we forked calls itself this (and publishes at pypi under this name) "python-lambda-4dn",