Merge pull request #26 from nexB/use-scancode-option

Use scancode -dump-license-data option

Author: pombredanne

.github/workflows/daily-update.yml

@@ -0,0 +1,34 @@
+name: Update LicenseDB with latest updates from scancode-toolkit develop daily
+on:
+  schedule:
+    - cron: '0 16 * * 0-6'
+
+jobs:
+  update_licenseDB:
+    name: Daily LicenseDB Update
+    runs-on: ubuntu-latest
+
+    defaults:
+      run:
+        shell: bash
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Python
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.8
+
+      - name: Give execute access to the script
+        run: chmod u+x ./etc/scripts/check_commit_run_update.sh
+
+      - name: Run script
+        run: ./etc/scripts/check_commit_run_update.sh
+
+      - name: Commit and Push to Publish
+        run: |
+          git config --global user.name 'LicenseDB Update GitHub Action'
+          git config --global user.email '[email protected]'
+          git commit -am "Automated LicenseDB update with latest from scancode-toolkit develop"
+          git push

Makefile

@@ -34,45 +34,36 @@ ACTIVATE=. bin/activate;
 BLACK_ARGS=--exclude="docs" .
 
 conf:
-	@echo "-> Configure the Python venv and install dependencies"
+	@echo "-> Configure the Python venv, clone and install scancode-toolkit"
 	${PYTHON_EXE} -m venv venv
+	@git clone https://github.com/nexB/scancode-toolkit.git
 	@venv/bin/pip install --upgrade pip
-	@venv/bin/pip install scancode-toolkit
+	@venv/bin/pip install -e ./scancode-toolkit/
 
-upgrade:
-	@echo "-> Configure the Python venv and install dependencies"
-	@venv/bin/pip install --upgrade scancode-toolkit
+restore:
+	@echo "-> Restoring the repository to a clean state"
+	git clean -fd
+	rm -rf scancode-toolkit/
+	git restore --worktree docs/
 
 clean:
 	# Remove the whole content of docs/ except for the CNAME file
+	# Remove the whole content of scancode-toolkit/
 	find docs/* ! -name 'CNAME' -exec git rm -r {} +
-
-isort:
-	@echo "-> Apply isort changes to ensure proper imports ordering"
-	@venv/bin/pip install isort==5.6.4
-	@venv/bin/isort app.py
-
-black:
-	@echo "-> Apply black code formatter"
-	@venv/bin/pip install black==20.8b1 isort
-	@venv/bin/black ${BLACK_ARGS}
-
-valid: isort black
+	find scancode-toolkit/* -exec git rm -r {} +
 
 html:
 	@echo "-> Generate the HTML content"
-	@venv/bin/python app.py
-	@echo "-> Copy the static assets"
-	@cp -R static/ docs/static/
+	@venv/bin/scancode-license-data --path docs/
 	@echo "Available at docs/index.html"
 
 build: conf html
 
 publish:
 	@echo "-> Add changes to git"
 	@git add .
-	git commit -m "Upgrade ScanCode-toolkit to latest version"
+	git commit -m "Upgrade with latest updates from ScanCode-toolkit develop"
 	@echo "-> Push changes to main repo"
 	@git push
 
-.PHONY: conf clean isort black valid html build publish
+.PHONY: conf clean html build publish

README.rst

@@ -28,6 +28,9 @@ Browse
 The web site is published at: https://scancode-licensedb.aboutcode.org/
 You can search the licenses by name, key and other attributes.
 
+This is updated daily by a GitHub action with updates from scancode-toolkit
+develop, if any.
+
 
 API
 ------
@@ -51,7 +54,9 @@ license details and texts using this license key as an identifier:
 
 
 This index and the static website is also available offline with ScanCode Toolkit as a
-command line option `--get-license-data`.
+console script available at configure/install. Sample command::
+  
+  scancode-license-data --path PATH
 
 
 Git
@@ -82,16 +87,7 @@ Build
 
 To re/generate the HTML and API content use this command::
 
-    $ make build
-
-
-Upgrade
--------
-
-To upgrade to the latest scancode-toolkit and generate the HTML and API content
-run this command::
-
-    $ make clean upgrade build publish
+    $ make restore conf html
 
 
 License

app.py

@@ -1,3 +1,49 @@
+---
+key: 389-exception
+short_name: 389 Directory Server Exception to GPL 2.0
+name: 389 Directory Server Exception to GPL 2.0
+category: Copyleft Limited
+owner: Fedora
+homepage_url: https://spdx.org/licenses/389-exception.html
+is_exception: yes
+spdx_license_key: 389-exception
+text_urls:
+    - http://www.directory.fedora.redhat.com/wiki/GPL_Exception_License_Text
+other_urls:
+    - http://directory.fedoraproject.org/wiki/GPL_Exception_License_Text
+    - http://www.gnu.org/licenses/gpl-2.0.txt
+    - https://web.archive.org/web/20080828121337/http://directory.fedoraproject.org/wiki/GPL_Exception_License_Text
+standard_notice: |
+    This Program is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the Free
+    Software Foundation; version 2 of the License.
+    This Program 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 General Public License for
+    more details.
+    You should have received a copy of the GNU General Public License along
+    with this Program; if not, write to the Free Software Foundation, Inc., 59
+    Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+    In addition, as a special exception, Red Hat, Inc. gives You the additional
+    right to link the code of this Program with code not covered under the GNU
+    General Public License ("Non-GPL Code") and to distribute linked
+    combinations including the two, subject to the limitations in this
+    paragraph. Non-GPL Code permitted under this exception must only link to
+    the code of this Program through those well defined interfaces identified
+    in the file named EXCEPTION found in the source code files (the "Approved
+    Interfaces"). The files of Non-GPL Code may instantiate templates or use
+    macros or inline functions from the Approved Interfaces without causing the
+    resulting work to be covered by the GNU General Public License. Only Red
+    Hat, Inc. may make changes or additions to the list of Approved Interfaces.
+    You must obey the GNU General Public License in all respects for all of the
+    Program code and other code used in conjunction with the Program except the
+    Non-GPL Code covered by this exception. If you modify this file, you may
+    extend this exception to your version of the file, but you are not
+    obligated to do so. If you do not wish to provide this exception without
+    modification, you must delete this exception statement from your version
+    and license this file solely under the GPL without exception.
+---
+
 In addition, as a special exception, Red Hat, Inc. gives You the additional
 right to link the code of this Program with code not covered under the GNU
 General Public License ("Non-GPL Code") and to distribute linked combinations

docs/389-exception.LICENSE

@@ -133,7 +133,7 @@
         <dd>
 
             <ul class="list-style-none">
-             <li><a href="http://directory.fedoraproject.org/wiki/GPL_Exception_License_Text" rel="noopener" target="_blank">http://directory.fedoraproject.org/wiki/GPL_Exception_License_Text</a></li><li><a href="http://www.gnu.org/licenses/gpl-2.0.txt" rel="noopener" target="_blank">http://www.gnu.org/licenses/gpl-2.0.txt</a></li>
+             <li><a href="http://directory.fedoraproject.org/wiki/GPL_Exception_License_Text" rel="noopener" target="_blank">http://directory.fedoraproject.org/wiki/GPL_Exception_License_Text</a></li><li><a href="http://www.gnu.org/licenses/gpl-2.0.txt" rel="noopener" target="_blank">http://www.gnu.org/licenses/gpl-2.0.txt</a></li><li><a href="https://web.archive.org/web/20080828121337/http://directory.fedoraproject.org/wiki/GPL_Exception_License_Text" rel="noopener" target="_blank">https://web.archive.org/web/20080828121337/http://directory.fedoraproject.org/wiki/GPL_Exception_License_Text</a></li>
             </ul>
 
         </dd>
@@ -203,7 +203,8 @@
       <a href="https://www.aboutcode.org/" target="_blank">AboutCode</a>
     </p>
     <p>Designed and built by <a href="https://www.nexb.com/" target="_blank">nexB</a>. Licensed under the <a href="cc-by-4.0.html">Creative Commons Attribution License 4.0 (CC-BY-4.0)</a>.</p>
-    <p>Generated with <a href="https://github.com/nexB/scancode-toolkit" target="_blank">ScanCode toolkit</a> 31.1.1 on Sep 05, 2022.</p>
+    <p>Generated with <a href="https://github.com/nexB/scancode-toolkit" target="_blank">ScanCode toolkit</a> 32.0.0rc1 on Jan 12, 2023.</p>
+    <p>This is updated daily automatically with latest updates from the develop branch of scancode-toolkit, if any.</p>
   </footer>
 </div>
 

docs/389-exception.html

@@ -1 +1,19 @@
-{"key": "389-exception", "short_name": "389 Directory Server Exception to GPL 2.0", "name": "389 Directory Server Exception to GPL 2.0", "category": "Copyleft Limited", "owner": "Fedora", "homepage_url": "https://spdx.org/licenses/389-exception.html", "is_exception": true, "spdx_license_key": "389-exception", "text_urls": ["http://www.directory.fedora.redhat.com/wiki/GPL_Exception_License_Text"], "other_urls": ["http://directory.fedoraproject.org/wiki/GPL_Exception_License_Text", "http://www.gnu.org/licenses/gpl-2.0.txt"], "standard_notice": "This Program is free software; you can redistribute it and/or modify it\nunder the terms of the GNU General Public License as published by the Free\nSoftware Foundation; version 2 of the License.\nThis Program is distributed in the hope that it will be useful, but WITHOUT\nANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\nFITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for\nmore details.\nYou should have received a copy of the GNU General Public License along\nwith this Program; if not, write to the Free Software Foundation, Inc., 59\nTemple Place, Suite 330, Boston, MA 02111-1307 USA.\nIn addition, as a special exception, Red Hat, Inc. gives You the additional\nright to link the code of this Program with code not covered under the GNU\nGeneral Public License (\"Non-GPL Code\") and to distribute linked\ncombinations including the two, subject to the limitations in this\nparagraph. Non-GPL Code permitted under this exception must only link to\nthe code of this Program through those well defined interfaces identified\nin the file named EXCEPTION found in the source code files (the \"Approved\nInterfaces\"). The files of Non-GPL Code may instantiate templates or use\nmacros or inline functions from the Approved Interfaces without causing the\nresulting work to be covered by the GNU General Public License. Only Red\nHat, Inc. may make changes or additions to the list of Approved Interfaces.\nYou must obey the GNU General Public License in all respects for all of the\nProgram code and other code used in conjunction with the Program except the\nNon-GPL Code covered by this exception. If you modify this file, you may\nextend this exception to your version of the file, but you are not\nobligated to do so. If you do not wish to provide this exception without\nmodification, you must delete this exception statement from your version\nand license this file solely under the GPL without exception.\n"}
+{
+  "key": "389-exception",
+  "short_name": "389 Directory Server Exception to GPL 2.0",
+  "name": "389 Directory Server Exception to GPL 2.0",
+  "category": "Copyleft Limited",
+  "owner": "Fedora",
+  "homepage_url": "https://spdx.org/licenses/389-exception.html",
+  "is_exception": true,
+  "spdx_license_key": "389-exception",
+  "text_urls": [
+    "http://www.directory.fedora.redhat.com/wiki/GPL_Exception_License_Text"
+  ],
+  "other_urls": [
+    "http://directory.fedoraproject.org/wiki/GPL_Exception_License_Text",
+    "http://www.gnu.org/licenses/gpl-2.0.txt",
+    "https://web.archive.org/web/20080828121337/http://directory.fedoraproject.org/wiki/GPL_Exception_License_Text"
+  ],
+  "standard_notice": "This Program is free software; you can redistribute it and/or modify it\nunder the terms of the GNU General Public License as published by the Free\nSoftware Foundation; version 2 of the License.\nThis Program is distributed in the hope that it will be useful, but WITHOUT\nANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\nFITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for\nmore details.\nYou should have received a copy of the GNU General Public License along\nwith this Program; if not, write to the Free Software Foundation, Inc., 59\nTemple Place, Suite 330, Boston, MA 02111-1307 USA.\nIn addition, as a special exception, Red Hat, Inc. gives You the additional\nright to link the code of this Program with code not covered under the GNU\nGeneral Public License (\"Non-GPL Code\") and to distribute linked\ncombinations including the two, subject to the limitations in this\nparagraph. Non-GPL Code permitted under this exception must only link to\nthe code of this Program through those well defined interfaces identified\nin the file named EXCEPTION found in the source code files (the \"Approved\nInterfaces\"). The files of Non-GPL Code may instantiate templates or use\nmacros or inline functions from the Approved Interfaces without causing the\nresulting work to be covered by the GNU General Public License. Only Red\nHat, Inc. may make changes or additions to the list of Approved Interfaces.\nYou must obey the GNU General Public License in all respects for all of the\nProgram code and other code used in conjunction with the Program except the\nNon-GPL Code covered by this exception. If you modify this file, you may\nextend this exception to your version of the file, but you are not\nobligated to do so. If you do not wish to provide this exception without\nmodification, you must delete this exception statement from your version\nand license this file solely under the GPL without exception.\n"
+}

docs/389-exception.json

@@ -11,6 +11,7 @@ text_urls:
 other_urls:
   - http://directory.fedoraproject.org/wiki/GPL_Exception_License_Text
   - http://www.gnu.org/licenses/gpl-2.0.txt
+  - https://web.archive.org/web/20080828121337/http://directory.fedoraproject.org/wiki/GPL_Exception_License_Text
 standard_notice: |
   This Program is free software; you can redistribute it and/or modify it
   under the terms of the GNU General Public License as published by the Free

docs/389-exception.yml

@@ -1,3 +1,12 @@
+---
+key: 3com-microcode
+short_name: 3Com Microcode
+name: 3Com Microcode
+category: Permissive
+owner: HP - Hewlett Packard
+notes: this is a Linux firmware BSD-like license with some weird extra terms
+spdx_license_key: LicenseRef-scancode-3com-microcode
+---
 
 Redistribution and use in source and binary forms of the 
 microcode software are permitted provided that the following conditions
@@ -26,4 +35,4 @@ MICROCODE SOFTWARE WILL NOT CREATE OR GIVE GROUNDS FOR A LICENSE BY
 IMPLICATION, ESTOPPEL, OR OTHERWISE IN ANY INTELLECTUAL PROPERTY RIGHTS
 (PATENT, COPYRIGHT, TRADE SECRET, MASK WORK, OR OTHER PROPRIETARY RIGHT)
 EMBODIED IN ANY OTHER 3COM HARDWARE OR SOFTWARE EITHER SOLELY OR IN
-COMBINATION WITH THE MICROCODE SOFTWARE
+COMBINATION WITH THE MICROCODE SOFTWARE