Merge pull request #2364 from itssingh/anti-capitalist

pombredanne · web-flow · commit 3a824235232b · 2021-08-25T13:59:11.000+02:00
Add new license Anti-Capitalist Software License #2362
diff --git a/src/licensedcode/data/licenses/anti-capitalist-1.4.LICENSE b/src/licensedcode/data/licenses/anti-capitalist-1.4.LICENSE
@@ -0,0 +1,19 @@
+ANTI-CAPITALIST SOFTWARE LICENSE (v 1.4)
+
+This is anti-capitalist software, released for free use by individuals and organizations that do not operate by capitalist principles.
+
+Permission is hereby granted, free of charge, to any person or organization (the "User") obtaining a copy of this software and associated documentation files (the "Software"), to use, copy, modify, merge, distribute, and/or sell copies of the Software, subject to the following conditions:
+
+1. The above copyright notice and this permission notice shall be included in all copies or modified versions of the Software.
+
+2. The User is one of the following:
+a. An individual person, laboring for themselves
+b. A non-profit organization
+c. An educational institution
+d. An organization that seeks shared profit for all of its members, and allows non-members to set the cost of their labor
+
+3. If the User is an organization with owners, then all owners are workers and all workers are owners with equal equity and/or equal vote.
+
+4. If the User is an organization, then the User is not law enforcement or military, or working for or under either.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT EXPRESS OR IMPLIED WARRANTY OF ANY KIND, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS 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.
diff --git a/src/licensedcode/data/licenses/anti-capitalist-1.4.yml b/src/licensedcode/data/licenses/anti-capitalist-1.4.yml
@@ -0,0 +1,7 @@
+key: anti-capitalist-1.4
+short_name: ACSL v. 1.4
+name: ANTI-CAPITALIST SOFTWARE LICENSE (v 1.4)
+category: Free Restricted
+owner: Everest Pipkin and Ramsey Nasser
+homepage_url: https://anticapitalist.software/
+spdx_license_key: LicenseRef-scancode-anti-capitalist-1.4    
diff --git a/src/licensedcode/data/licenses/google-tos-2014.yml b/src/licensedcode/data/licenses/google-tos-2014.yml
@@ -1,5 +1,5 @@
 key: google-tos-2014
-short_name: Google TOS 2014	
+short_name: Google TOS 2014
 name: Google Terms of Service 2014
 category: Proprietary Free
 owner: Google
diff --git a/src/licensedcode/data/licenses/google-tos-2017.yml b/src/licensedcode/data/licenses/google-tos-2017.yml
@@ -1,5 +1,5 @@
 key: google-tos-2017
-short_name: Google TOS 2017	
+short_name: Google TOS 2017
 name: Google Terms of Service 2017
 category: Proprietary Free
 owner: Google
diff --git a/src/licensedcode/data/licenses/google-tos-2019.yml b/src/licensedcode/data/licenses/google-tos-2019.yml
@@ -1,5 +1,5 @@
 key: google-tos-2019
-short_name: Google TOS 2019	
+short_name: Google TOS 2019
 name: Google Terms of Service 2019
 category: Proprietary Free
 owner: Google
diff --git a/src/licensedcode/data/licenses/google-tos-2020.yml b/src/licensedcode/data/licenses/google-tos-2020.yml
@@ -1,5 +1,5 @@
 key: google-tos-2020
-short_name: Google TOS 2020	
+short_name: Google TOS 2020
 name: Google Terms of Service 2020
 category: Proprietary Free
 owner: Google
diff --git a/src/licensedcode/data/rules/anti_capitalist1.RULE b/src/licensedcode/data/rules/anti_capitalist1.RULE
@@ -0,0 +1,12 @@
+This is anti-capitalist software, released for free use by individuals and organizations that do not operate by capitalist principles.
+
+Permission is hereby granted, free of charge, to any person or organization (the "User") obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+1. The above copyright notice and this permission notice shall be included in all copies of the Software.
+2. The User is one of the following:
+    a. An individual person
+    b. An organization of people that does not seek profit
+    c. An organization of people that seeks shared profit for all its members
+3. If the User is an organization with owners, then all owners are workers and all workers are owners.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT EXPRESS OR IMPLIED WARRANTY OF ANY KIND, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS 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.
diff --git a/src/licensedcode/data/rules/anti_capitalist1.yml b/src/licensedcode/data/rules/anti_capitalist1.yml
@@ -0,0 +1,2 @@
+license_expression: anti-capitalist-1.4
+is_license_text: yes   
diff --git a/src/licensedcode/data/rules/anti_capitalist2.RULE b/src/licensedcode/data/rules/anti_capitalist2.RULE
@@ -0,0 +1,12 @@
+This is anti-capitalist software, released for free use by individuals and organizations that do not operate by capitalist principles.
+
+Permission is hereby granted, free of charge, to any person or organization (the "User") obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+1. The above copyright notice and this permission notice shall be included in all copies of the Software.
+2. The User is one of the following:
+    a. An individual person
+    b. An organization of people that does not seek profit
+    c. An organization of people that seeks shared profit for all its members and does not exploit the labor of non-members
+3. If the User is an organization with owners, then all owners are workers and all workers are owners with equal share.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT EXPRESS OR IMPLIED WARRANTY OF ANY KIND, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS 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.
diff --git a/src/licensedcode/data/rules/anti_capitalist2.yml b/src/licensedcode/data/rules/anti_capitalist2.yml
@@ -0,0 +1,2 @@
+license_expression: anti-capitalist-1.4
+is_license_text: yes  
diff --git a/src/licensedcode/data/rules/anti_capitalist3.RULE b/src/licensedcode/data/rules/anti_capitalist3.RULE
@@ -0,0 +1,13 @@
+This is anti-capitalist software, released for free use by individuals and organizations that do not operate by capitalist principles.
+
+Permission is hereby granted, free of charge, to any person or organization (the "User") obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+1. The above copyright notice and this permission notice shall be included in all copies of the Software.
+2. The User is one of the following:
+    a. An individual person
+    b. An organization of people that does not seek profit
+    c. An organization of people that seeks shared profit for all its members and does not exploit the labor of non-members
+3. If the User is an organization with owners, then all owners are workers and all workers are owners with equal share.
+4. If the User is an organization, then the User is not law enforcement or military, or working under either.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT EXPRESS OR IMPLIED WARRANTY OF ANY KIND, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS 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.
diff --git a/src/licensedcode/data/rules/anti_capitalist3.yml b/src/licensedcode/data/rules/anti_capitalist3.yml
@@ -0,0 +1,2 @@
+license_expression: anti-capitalist-1.4
+is_license_text: yes    
diff --git a/src/licensedcode/data/rules/anti_capitalist4.RULE b/src/licensedcode/data/rules/anti_capitalist4.RULE
@@ -0,0 +1,18 @@
+ANTI-CAPITALIST SOFTWARE LICENSE (v 1.3)
+
+This is anti-capitalist software, released for free use by individuals and organizations that do not operate by capitalist principles.
+
+Permission is hereby granted, free of charge, to any person or organization (the "User") obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software for any purpose, including the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Software, subject to the following conditions:
+
+1. The above copyright notice and this permission notice shall be included in all copies or modified versions of the Software.
+
+2. The User is one of the following:
+    a. An individual person, working for themselves
+    b. An non-profit organization
+    c. An organization that seeks shared profit for all of its members and allows non-members to set the cost of their  labor
+
+3. If the User is an organization with owners, then all owners are workers and all workers are owners with equal equity and/or equal vote.
+
+4. If the User is an organization, then the User is not law enforcement or military, or working under either.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT EXPRESS OR IMPLIED WARRANTY OF ANY KIND, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS 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.
diff --git a/src/licensedcode/data/rules/anti_capitalist4.yml b/src/licensedcode/data/rules/anti_capitalist4.yml
@@ -0,0 +1,3 @@
+license_expression: anti-capitalist-1.4
+is_license_text: yes
+notes: version 1.3 is the same as 1.4 hence treated as a rule
diff --git a/tests/licensedcode/test_match_spdx_lid.py b/tests/licensedcode/test_match_spdx_lid.py
@@ -68,13 +68,12 @@ def test_method(self):
         qry = Query(location=test_loc, idx=idx)
         results = [list(l) for l in qry.spdx_lines]
         if regen:
-            wmode = 'w'
-            with open(expected_loc, wmode) as ef:
+            with open(expected_loc, 'w') as ef:
                 json.dump(results, ef, indent=2)
             expected = results
         else:
-            with open(expected_loc, 'rb') as ef:
-                expected = json.load(ef, encoding='utf-8')
+            with open(expected_loc) as ef:
+                expected = json.load(ef)
 
         assert results == expected
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+license_expression: anti-capitalist-1.4`
	`2`	`+is_license_text: yes`