From 077427b91fdd50249e594fd5c9826feb2e9df306 Mon Sep 17 00:00:00 2001 From: Philippe Ombredanne Date: Thu, 3 Sep 2020 17:41:32 +0200 Subject: DOC: Use SPDX license expressions with correct license (gh-17238) * Use SPDX license expressions with correct license tools/npy_tempita/license.txt license is MIT not a "BSD Derived" Also use SPDX license identifiers and expressions for clarity Based on original report at https://github.com/nexB/scancode-toolkit/issues/2189 Reported-by: Frank Viernau Signed-off-by: Philippe Ombredanne * Use correct case for BSD licenses identifers Reported-by: Sebastian Berg Signed-off-by: Philippe Ombredanne --- LICENSES_bundled.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'LICENSES_bundled.txt') diff --git a/LICENSES_bundled.txt b/LICENSES_bundled.txt index ea349c7ee..e9c66d1dc 100644 --- a/LICENSES_bundled.txt +++ b/LICENSES_bundled.txt @@ -3,22 +3,22 @@ compatibly licensed. We list these here. Name: Numpydoc Files: doc/sphinxext/numpydoc/* -License: 2-clause BSD +License: BSD-2-Clause For details, see doc/sphinxext/LICENSE.txt Name: scipy-sphinx-theme Files: doc/scipy-sphinx-theme/* -License: 3-clause BSD, PSF and Apache 2.0 +License: BSD-3-Clause AND PSF-2.0 AND Apache-2.0 For details, see doc/scipy-sphinx-theme/LICENSE.txt Name: lapack-lite Files: numpy/linalg/lapack_lite/* -License: 3-clause BSD +License: BSD-3-Clause For details, see numpy/linalg/lapack_lite/LICENSE.txt Name: tempita Files: tools/npy_tempita/* -License: BSD derived +License: MIT For details, see tools/npy_tempita/license.txt Name: dragon4 -- cgit v1.2.1