Skip to content

Commit

Permalink
Improve license detection for psycopg2 #2186 #2187 #2188
Browse files Browse the repository at this point in the history
Reported-by: Armijn Hemel @armijnhemel
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
  • Loading branch information
pombredanne committed Sep 3, 2020
1 parent ed80f68 commit bb5f388
Show file tree
Hide file tree
Showing 11 changed files with 80 additions and 0 deletions.
9 changes: 9 additions & 0 deletions src/licensedcode/data/rules/lgpl-3.0-plus_117.RULE
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# psycopg2 is free software: you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published
# by the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# psycopg2 is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
# License for more details.
3 changes: 3 additions & 0 deletions src/licensedcode/data/rules/lgpl-3.0-plus_117.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
license_expression: lgpl-3.0-plus
is_license_notice: yes
relevance: 100
47 changes: 47 additions & 0 deletions src/licensedcode/data/rules/psf-2.0_1.RULE
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
* PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
* --------------------------------------------
*
* 1. This LICENSE AGREEMENT is between the Python Software Foundation
* ("PSF"), and the Individual or Organization ("Licensee") accessing and
* otherwise using this software ("Python") in source or binary form and
* its associated documentation.
*
* 2. Subject to the terms and conditions of this License Agreement, PSF hereby
* grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
* analyze, test, perform and/or display publicly, prepare derivative works,
* distribute, and otherwise use Python alone or in any derivative version,
* provided, however, that PSF's License Agreement and PSF's notice of copyright,
* i.e., "Copyright (c) 2001-2019, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
* Python Software Foundation; All Rights Reserved" are retained in Python alone or
* in any derivative version prepared by Licensee.
*
* 3. In the event Licensee prepares a derivative work that is based on
* or incorporates Python or any part thereof, and wants to make
* the derivative work available to others as provided herein, then
* Licensee hereby agrees to include in any such work a brief summary of
* the changes made to Python.
*
* 4. PSF is making Python available to Licensee on an "AS IS"
* basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
* IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
* DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
* FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
* INFRINGE ANY THIRD PARTY RIGHTS.
*
* 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
* FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
* A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
* OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
*
* 6. This License Agreement will automatically terminate upon a material
* breach of its terms and conditions.
*
* 7. Nothing in this License Agreement shall be deemed to create any
* relationship of agency, partnership, or joint venture between PSF and
* Licensee. This License Agreement does not grant permission to use PSF
* trademarks or trade name in a trademark sense to endorse or promote
* products or services of Licensee, or any third party.
*
* 8. By copying, installing or otherwise using Python, Licensee
* agrees to be bound by the terms and conditions of this License
* Agreement.
8 changes: 8 additions & 0 deletions src/licensedcode/data/rules/psf-2.0_1.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
license_expression: psf-2.0
is_license_text: yes
relevance: 100
ignorable_copyrights:
- Copyright (c) 2001-2019, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Python Software
Foundation
ignorable_holders:
- Python Software Foundation
1 change: 1 addition & 0 deletions src/licensedcode/data/rules/public-domain_264.RULE
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
This software is Public Domain and may be used without restrictions.
3 changes: 3 additions & 0 deletions src/licensedcode/data/rules/public-domain_264.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
license_expression: public-domain
is_license_text: yes
relevance: 100
1 change: 1 addition & 0 deletions src/licensedcode/data/rules/public-domain_265.RULE
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
This software is Public Domain
3 changes: 3 additions & 0 deletions src/licensedcode/data/rules/public-domain_265.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
license_expression: public-domain
is_license_text: yes
relevance: 100
1 change: 1 addition & 0 deletions src/licensedcode/data/rules/public-domain_docutils3.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
license_expression: public-domain
relevance: 100
is_license_text: yes
2 changes: 2 additions & 0 deletions src/licensedcode/data/rules/pypi_epl-2.0.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
license_expression: epl-2.0
is_license_tag: yes
relevance: 100

Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
license_expression: lgpl-2.0-plus
is_license_tag: yes
relevance: 100

0 comments on commit bb5f388

Please sign in to comment.